Rename integTest to bwcTestSample for bwc test projects (#38433)

alpar-t · alpar-t · commit 5cea933fed7c · 2019-02-11T15:12:10.000+02:00
* 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
diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle
@@ -98,12 +98,12 @@ 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)
diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle
@@ -66,12 +66,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)
diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle
@@ -149,12 +149,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)
diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle
@@ -58,7 +58,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"
@@ -87,4 +87,4 @@ task verifyDocsLuceneVersion {
   }
 }
 
-check.dependsOn integTest, verifyDocsLuceneVersion
+check.dependsOn bwcTestSnapshots, verifyDocsLuceneVersion
diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle
@@ -262,15 +262,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
diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle
@@ -327,14 +327,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

Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,12 @@ for (Version version : bwcVersions.indexCompatible) {`
`98`	`98`	`unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test`
`99`	`99`
`100`	`100`	`// basic integ tests includes testing bwc against the most recent version`
`101`		`-task integTest {`
	`101`	`+task bwcTestSnapshots {`
`102`	`102`	`if (project.bwc_tests_enabled) {`
`103`	`103`	`for (final def version : bwcVersions.unreleasedIndexCompatible) {`
`104`	`104`	`dependsOn "v${version}#bwcTest"`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-check.dependsOn(integTest)`
	`109`	`+check.dependsOn(bwcTestSnapshots)`
Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@ for (Version version : bwcVersions.wireCompatible) {`
`66`	`66`	`unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test`
`67`	`67`
`68`	`68`	`// basic integ tests includes testing bwc against the most recent version`
`69`		`-task integTest {`
	`69`	`+task bwcTestSnapshots {`
`70`	`70`	`if (project.bwc_tests_enabled) {`
`71`	`71`	`for (final def version : bwcVersions.unreleasedWireCompatible) {`
`72`	`72`	`dependsOn "v${version}#bwcTest"`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-check.dependsOn(integTest)`
	`77`	`+check.dependsOn(bwcTestSnapshots)`
Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,12 @@ for (Version version : bwcVersions.wireCompatible) {`
`149`	`149`	`unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test`
`150`	`150`
`151`	`151`	`// basic integ tests includes testing bwc against the most recent version`
`152`		`-task integTest {`
	`152`	`+task bwcTestSnapshots {`
`153`	`153`	`if (project.bwc_tests_enabled) {`
`154`	`154`	`for (final def version : bwcVersions.unreleasedWireCompatible) {`
`155`	`155`	`dependsOn "v${version}#bwcTest"`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`-check.dependsOn(integTest)`
	`160`	`+check.dependsOn(bwcTestSnapshots)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ for (Version version : bwcVersions.indexCompatible) {`
`58`	`58`
`59`	`59`	`unitTest.enabled = false`
`60`	`60`
`61`		`-task integTest {`
	`61`	`+task bwcTestSnapshots {`
`62`	`62`	`if (project.bwc_tests_enabled) {`
`63`	`63`	`final def version = bwcVersions.unreleasedIndexCompatible.first()`
`64`	`64`	`dependsOn "v${version}#bwcTest"`
`@@ -87,4 +87,4 @@ task verifyDocsLuceneVersion {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-check.dependsOn integTest, verifyDocsLuceneVersion`
	`90`	`+check.dependsOn bwcTestSnapshots, verifyDocsLuceneVersion`
Original file line number	Diff line number	Diff line change
`@@ -262,15 +262,15 @@ subprojects {`
`262`	`262`	`unitTest.enabled = false // no unit tests for full cluster restarts, only the rest integration test`
`263`	`263`
`264`	`264`	`// basic integ tests includes testing bwc against the most recent version`
`265`		`- task integTest {`
	`265`	`+ task bwcTestSnapshots {`
`266`	`266`	`if (project.bwc_tests_enabled) {`
`267`	`267`	`for (final def version : bwcVersions.unreleasedIndexCompatible) {`
`268`	`268`	`dependsOn "v${version}#bwcTest"`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
`273`		`- check.dependsOn(integTest)`
	`273`	`+ check.dependsOn(bwcTestSnapshots)`
`274`	`274`
`275`	`275`	`dependencies {`
`276`	`276`	`// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here`
Original file line number	Diff line number	Diff line change
`@@ -327,14 +327,14 @@ subprojects {`
`327`	`327`	`unitTest.enabled = false // no unit tests for rolling upgrades, only the rest integration test`
`328`	`328`
`329`	`329`	`// basic integ tests includes testing bwc against the most recent version`
`330`		`- task integTest {`
	`330`	`+ task bwcTestSnapshots {`
`331`	`331`	`if (project.bwc_tests_enabled) {`
`332`	`332`	`for (final def version : bwcVersions.unreleasedWireCompatible) {`
`333`	`333`	`dependsOn "v${version}#bwcTest"`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`	`}`
`337`		`- check.dependsOn(integTest)`
	`337`	`+ check.dependsOn(bwcTestSnapshots)`
`338`	`338`
`339`	`339`	`dependencies {`
`340`	`340`	`// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here`