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:
Alpar Torok 2018-11-14 14:14:03 +02:00
parent 72504c2512
commit 212c202709
6 changed files with 6 additions and 4 deletions

View File

@ -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 {

View File

@ -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)

View File

@ -5,7 +5,7 @@ plugins {
testClusters {
myTestCluster {
distribution = 'ZIP'
version = '7.0.0-alpha1-SNAPSHOT'
version = System.getProperty("test.version_under_test")
}
}

View File

@ -4,7 +4,7 @@ plugins {
testClusters {
myTestCluster {
distribution = 'ZIP'
version = '7.0.0-alpha1-SNAPSHOT'
version = System.getProperty("test.version_under_test")
}
}
task user1 {

View File

@ -5,7 +5,7 @@ plugins {
testClusters {
myTestCluster {
distribution = 'ZIP'
version = '7.0.0-alpha1-SNAPSHOT'
version = System.getProperty("test.version_under_test")
}
}

View File

@ -13,7 +13,7 @@ allprojects {
testClusters {
myTestCluster {
distribution = 'ZIP'
version = '7.0.0-alpha1-SNAPSHOT'
version = System.getProperty("test.version_under_test")
}
}