honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use explicit version for build-tools in example plugin integ tests (#37792) 

The example plugins are currently built within the build-tools integ
tests as a means to ensure the gradle plugin works for external plugin
builds. These tests generate a dummy build.gradle, and a dummy local
maven repository to find the local builds dependencies in. Currently
that build-tools dependency uses "+" as the version. However, this
allows gradle to find the "latest" version, and unfortunately gradle has
its own plugin repository which is apparently connected to jcenter. This
recently triggered a flood of CI failures when jcenter suddenly pulled
alpha2, and all builds started trying to use that instead of the locally
built build-tools. This commit uses the explicit version of build-tools
that was build locally, which will cause resolution to stop when the
local repo is first checked.
This commit is contained in:
Ryan Ernst 2019-01-23 17:39:13 -08:00 committed by GitHub
parent fdb66039d4
commit 49b8b07758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/src/test/java/org/elasticsearch/gradle/BuildExamplePluginsIT.java
View File

@ -40,13 +40,15 @@ import java.util.stream.Collectors;
public class BuildExamplePluginsIT extends GradleIntegrationTestCase { public class BuildExamplePluginsIT extends GradleIntegrationTestCase {
private static List<File> EXAMPLE_PLUGINS = Collections.unmodifiableList( private static final List<File> EXAMPLE_PLUGINS = Collections.unmodifiableList(
Arrays.stream( Arrays.stream(
Objects.requireNonNull(System.getProperty("test.build-tools.plugin.examples")) Objects.requireNonNull(System.getProperty("test.build-tools.plugin.examples"))
.split(File.pathSeparator) .split(File.pathSeparator)
).map(File::new).collect(Collectors.toList()) ).map(File::new).collect(Collectors.toList())
); );
private static final String BUILD_TOOLS_VERSION = Objects.requireNonNull(System.getProperty("test.version_under_test"));
@Rule @Rule
public TemporaryFolder tmpDir = new TemporaryFolder(); public TemporaryFolder tmpDir = new TemporaryFolder();
@ -96,7 +98,8 @@ public class BuildExamplePluginsIT extends GradleIntegrationTestCase {
private void adaptBuildScriptForTest() throws IOException { private void adaptBuildScriptForTest() throws IOException {
// Add the local repo as a build script URL so we can pull in build-tools and apply the plugin under test // Add the local repo as a build script URL so we can pull in build-tools and apply the plugin under test
// + is ok because we have no other repo and just want to pick up latest // we need to specify the exact version of build-tools because gradle automatically adds its plugin portal
// which appears to mirror jcenter, opening us up to pulling a "later" version of build-tools
writeBuildScript( writeBuildScript(
"buildscript {\n" + "buildscript {\n" +
" repositories {\n" + " repositories {\n" +
@ -105,7 +108,7 @@ public class BuildExamplePluginsIT extends GradleIntegrationTestCase {
" }\n" + " }\n" +
" }\n" + " }\n" +
" dependencies {\n" + " dependencies {\n" +
" classpath \"org.elasticsearch.gradle:build-tools:+\"\n" + " classpath \"org.elasticsearch.gradle:build-tools:" + BUILD_TOOLS_VERSION + "\"\n" +
" }\n" + " }\n" +
"}\n" "}\n"
); );