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.
This commit is contained in:
parent
72504c2512
commit
212c202709
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -5,7 +5,7 @@ plugins {
|
|||
testClusters {
|
||||
myTestCluster {
|
||||
distribution = 'ZIP'
|
||||
version = '7.0.0-alpha1-SNAPSHOT'
|
||||
version = System.getProperty("test.version_under_test")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ plugins {
|
|||
testClusters {
|
||||
myTestCluster {
|
||||
distribution = 'ZIP'
|
||||
version = '7.0.0-alpha1-SNAPSHOT'
|
||||
version = System.getProperty("test.version_under_test")
|
||||
}
|
||||
}
|
||||
task user1 {
|
||||
|
|
|
@ -5,7 +5,7 @@ plugins {
|
|||
testClusters {
|
||||
myTestCluster {
|
||||
distribution = 'ZIP'
|
||||
version = '7.0.0-alpha1-SNAPSHOT'
|
||||
version = System.getProperty("test.version_under_test")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ allprojects {
|
|||
testClusters {
|
||||
myTestCluster {
|
||||
distribution = 'ZIP'
|
||||
version = '7.0.0-alpha1-SNAPSHOT'
|
||||
version = System.getProperty("test.version_under_test")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue