From 212c20270961f9914f0a3bbde6faaf2635e67024 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Wed, 14 Nov 2018 14:14:03 +0200 Subject: [PATCH] Remove hard coded version string in tests - The current version was hard coded in the test, causing it to fail as we removed the qualifier - also applied the base plugin to the root project to get the `clean` task to work as expected. This was preventing the failure from reproducing locally. --- build.gradle | 1 + buildSrc/build.gradle | 1 + buildSrc/src/testKit/testclusters/build.gradle | 2 +- .../src/testKit/testclusters_multiproject/alpha/build.gradle | 2 +- .../src/testKit/testclusters_multiproject/bravo/build.gradle | 2 +- buildSrc/src/testKit/testclusters_multiproject/build.gradle | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b21d0a48520..7e016841516 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder plugins { id 'com.gradle.build-scan' version '1.13.2' + id 'base' } if (properties.get("org.elasticsearch.acceptScanTOS", "false") == "true") { buildScan { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ca1523cd775..177a128d31e 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -195,6 +195,7 @@ if (project != rootProject) { ).asPath, ) systemProperty 'test.local-test-repo-path', "${rootProject.buildDir}/local-test-repo" + systemProperty 'test.version_under_test', version systemProperty 'test.lucene-snapshot-revision', (versions.lucene =~ /\w+-snapshot-([a-z0-9]+)/)[0][1] } check.dependsOn(integTest) diff --git a/buildSrc/src/testKit/testclusters/build.gradle b/buildSrc/src/testKit/testclusters/build.gradle index a9b30d91026..15e34bbccd4 100644 --- a/buildSrc/src/testKit/testclusters/build.gradle +++ b/buildSrc/src/testKit/testclusters/build.gradle @@ -5,7 +5,7 @@ plugins { testClusters { myTestCluster { distribution = 'ZIP' - version = '7.0.0-alpha1-SNAPSHOT' + version = System.getProperty("test.version_under_test") } } diff --git a/buildSrc/src/testKit/testclusters_multiproject/alpha/build.gradle b/buildSrc/src/testKit/testclusters_multiproject/alpha/build.gradle index 3c4aebf8f23..dda6be2f6a5 100644 --- a/buildSrc/src/testKit/testclusters_multiproject/alpha/build.gradle +++ b/buildSrc/src/testKit/testclusters_multiproject/alpha/build.gradle @@ -4,7 +4,7 @@ plugins { testClusters { myTestCluster { distribution = 'ZIP' - version = '7.0.0-alpha1-SNAPSHOT' + version = System.getProperty("test.version_under_test") } } task user1 { diff --git a/buildSrc/src/testKit/testclusters_multiproject/bravo/build.gradle b/buildSrc/src/testKit/testclusters_multiproject/bravo/build.gradle index d479ceaa058..b62302d9d54 100644 --- a/buildSrc/src/testKit/testclusters_multiproject/bravo/build.gradle +++ b/buildSrc/src/testKit/testclusters_multiproject/bravo/build.gradle @@ -5,7 +5,7 @@ plugins { testClusters { myTestCluster { distribution = 'ZIP' - version = '7.0.0-alpha1-SNAPSHOT' + version = System.getProperty("test.version_under_test") } } diff --git a/buildSrc/src/testKit/testclusters_multiproject/build.gradle b/buildSrc/src/testKit/testclusters_multiproject/build.gradle index acd3213d2b1..06234f4b368 100644 --- a/buildSrc/src/testKit/testclusters_multiproject/build.gradle +++ b/buildSrc/src/testKit/testclusters_multiproject/build.gradle @@ -13,7 +13,7 @@ allprojects { testClusters { myTestCluster { distribution = 'ZIP' - version = '7.0.0-alpha1-SNAPSHOT' + version = System.getProperty("test.version_under_test") } }