浏览代码

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.
Alpar Torok 7 年之前
父节点
当前提交
212c202709

+ 1 - 0
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 {

+ 1 - 0
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)

+ 1 - 1
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")
     }
 }
 

+ 1 - 1
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 {

+ 1 - 1
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")
     }
 }
 

+ 1 - 1
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")
     }
 }