From bd4ca4c7028f9e77ffa7f57e62325384c73c1495 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Mon, 11 Feb 2019 14:58:00 +0200 Subject: [PATCH] Rename integTest to bwcTestSample for bwc test projects (#38433) * 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 --- qa/full-cluster-restart/build.gradle | 4 ++-- qa/mixed-cluster/build.gradle | 4 ++-- qa/rolling-upgrade/build.gradle | 4 ++-- qa/verify-version-constants/build.gradle | 4 ++-- x-pack/qa/full-cluster-restart/build.gradle | 4 ++-- x-pack/qa/rolling-upgrade-basic/build.gradle | 4 ++-- x-pack/qa/rolling-upgrade/build.gradle | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index cd5e836757c..60c552fc100 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -95,7 +95,7 @@ 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" @@ -103,5 +103,5 @@ task integTest { } } -check.dependsOn(integTest) +check.dependsOn(bwcTestSnapshots) diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle index 3de7d4132bb..40ffef5e25d 100644 --- a/qa/mixed-cluster/build.gradle +++ b/qa/mixed-cluster/build.gradle @@ -63,7 +63,7 @@ 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" @@ -71,4 +71,4 @@ task integTest { } } -check.dependsOn(integTest) +check.dependsOn(bwcTestSnapshots) diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index 160edea6a78..0fa245959a8 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -142,7 +142,7 @@ 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" @@ -150,4 +150,4 @@ task integTest { } } -check.dependsOn(integTest) +check.dependsOn(bwcTestSnapshots) diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle index a4cfa268755..14a6b4362f1 100644 --- a/qa/verify-version-constants/build.gradle +++ b/qa/verify-version-constants/build.gradle @@ -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" @@ -83,4 +83,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 index fe7d4e9974c..5c780b2c121 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -250,7 +250,7 @@ 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" @@ -258,7 +258,7 @@ subprojects { } } - 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-basic/build.gradle b/x-pack/qa/rolling-upgrade-basic/build.gradle index 7ede2424f07..715d7d0854b 100644 --- a/x-pack/qa/rolling-upgrade-basic/build.gradle +++ b/x-pack/qa/rolling-upgrade-basic/build.gradle @@ -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" diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index c6b739aea0e..6aba0792bbb 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -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