Skip to content

Commit

Permalink
Rename integTest to bwcTestSample for bwc test projects (elastic#38433)
Browse files Browse the repository at this point in the history
* Rename integTest to bwcTestSample for bwc test projects

This change renames the `integTest` task to `bwcTestSample` for projects
testing bwc to make it possible to run all the bwc tests that check
would run without running on bwc tests.

This change makes it possible to add a new PR check on backports to make
sure these don't break BWC tests in master.

* Rename task as per PR
  • Loading branch information
alpar-t committed Feb 11, 2019
1 parent fe8bd75 commit bd4ca4c
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions qa/full-cluster-restart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ for (Version version : bwcVersions.indexCompatible) {
unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedIndexCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}

check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)

4 changes: 2 additions & 2 deletions qa/mixed-cluster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ for (Version version : bwcVersions.wireCompatible) {
unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedWireCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}

check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)
4 changes: 2 additions & 2 deletions qa/rolling-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ for (Version version : bwcVersions.wireCompatible) {
unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedWireCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}

check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)
4 changes: 2 additions & 2 deletions qa/verify-version-constants/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ for (Version version : bwcVersions.indexCompatible) {

unitTest.enabled = false

task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
final def version = bwcVersions.unreleasedIndexCompatible.first()
dependsOn "v${version}#bwcTest"
Expand Down Expand Up @@ -83,4 +83,4 @@ task verifyDocsLuceneVersion {
}
}

check.dependsOn integTest, verifyDocsLuceneVersion
check.dependsOn bwcTestSnapshots, verifyDocsLuceneVersion
4 changes: 2 additions & 2 deletions x-pack/qa/full-cluster-restart/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,15 @@ subprojects {
unitTest.enabled = false // no unit tests for full cluster restarts, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedIndexCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}

check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)

dependencies {
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
Expand Down
4 changes: 2 additions & 2 deletions x-pack/qa/rolling-upgrade-basic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ for (Version version : bwcVersions.wireCompatible) {
unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedWireCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}
check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)

compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-try,-unchecked"

Expand Down
4 changes: 2 additions & 2 deletions x-pack/qa/rolling-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -331,14 +331,14 @@ subprojects {
unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test

// basic integ tests includes testing bwc against the most recent version
task integTest {
task bwcTestSnapshots {
if (project.bwc_tests_enabled) {
for (final def version : bwcVersions.unreleasedWireCompatible) {
dependsOn "v${version}#bwcTest"
}
}
}
check.dependsOn(integTest)
check.dependsOn(bwcTestSnapshots)

dependencies {
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
Expand Down

0 comments on commit bd4ca4c

Please sign in to comment.