Original commit: elastic/x-pack-elasticsearch@ebe599a422
This commit is contained in:
parent
4d24748170
commit
933c22dce6
|
@ -2,7 +2,6 @@ import org.elasticsearch.gradle.BuildPlugin
|
||||||
import org.elasticsearch.gradle.Version
|
import org.elasticsearch.gradle.Version
|
||||||
import org.elasticsearch.gradle.VersionProperties
|
import org.elasticsearch.gradle.VersionProperties
|
||||||
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
|
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
|
||||||
import sun.reflect.generics.reflectiveObjects.NotImplementedException
|
|
||||||
|
|
||||||
if (project.projectDir.name != 'x-pack-elasticsearch') {
|
if (project.projectDir.name != 'x-pack-elasticsearch') {
|
||||||
throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack-elasticsearch')
|
throw new GradleException('You must checkout x-pack-elasticsearch in the following directory: <path to Elasticsearch checkout>/../elasticsearch-extra/x-pack-elasticsearch')
|
||||||
|
|
|
@ -226,14 +226,12 @@ subprojects {
|
||||||
|
|
||||||
// basic integ tests includes testing bwc against the most recent version
|
// basic integ tests includes testing bwc against the most recent version
|
||||||
task integTest {
|
task integTest {
|
||||||
if (project.bwc_tests_enabled) {
|
|
||||||
if (project.bwc_tests_enabled) {
|
if (project.bwc_tests_enabled) {
|
||||||
for (final def version : versionCollection.basicIntegrationTestVersions) {
|
for (final def version : versionCollection.basicIntegrationTestVersions) {
|
||||||
dependsOn "v${version}#bwcTest"
|
dependsOn "v${version}#bwcTest"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
check.dependsOn(integTest)
|
check.dependsOn(integTest)
|
||||||
|
|
||||||
|
|
|
@ -255,14 +255,12 @@ subprojects {
|
||||||
|
|
||||||
// basic integ tests includes testing bwc against the most recent version
|
// basic integ tests includes testing bwc against the most recent version
|
||||||
task integTest {
|
task integTest {
|
||||||
if (project.bwc_tests_enabled) {
|
|
||||||
if (project.bwc_tests_enabled) {
|
if (project.bwc_tests_enabled) {
|
||||||
for (final def version : versionCollection.basicIntegrationTestVersions) {
|
for (final def version : versionCollection.basicIntegrationTestVersions) {
|
||||||
dependsOn "v${version}#bwcTest"
|
dependsOn "v${version}#bwcTest"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
check.dependsOn(integTest)
|
check.dependsOn(integTest)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
Loading…
Reference in New Issue