diff --git a/build-tools-internal/src/main/groovy/elasticsearch.bwc-test.gradle b/build-tools-internal/src/main/groovy/elasticsearch.bwc-test.gradle index 78d55797e5f6..6ebf9cb0a725 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.bwc-test.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.bwc-test.gradle @@ -34,5 +34,4 @@ tasks.withType(Test).configureEach { } tasks.matching { it.name.equals("check") }.configureEach {dependsOn(bwcTestSnapshots) } - tasks.matching { it.name.equals("test") }.configureEach {enabled = false} diff --git a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle index 501ce6190b8a..4a880eb402d0 100644 --- a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle +++ b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle @@ -11,7 +11,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.rest-resources' diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index 334161795526..8456ebf5cd48 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -12,7 +12,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle index 7a1191603fc2..562847cd9faa 100644 --- a/qa/mixed-cluster/build.gradle +++ b/qa/mixed-cluster/build.gradle @@ -12,7 +12,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.rest-resources' diff --git a/qa/multi-cluster-search/build.gradle b/qa/multi-cluster-search/build.gradle index 009e83daffea..817a9a41e42e 100644 --- a/qa/multi-cluster-search/build.gradle +++ b/qa/multi-cluster-search/build.gradle @@ -9,7 +9,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-resources' dependencies { @@ -46,6 +46,4 @@ tasks.register("integTest") { dependsOn "mixedClusterTest" } -tasks.named("test").configure { enabled = false }// no unit tests for multi-cluster-search, only integration tests - tasks.named("check").configure { dependsOn("integTest") } diff --git a/qa/repository-multi-version/build.gradle b/qa/repository-multi-version/build.gradle index 6d0c8bc54890..e947453a1e57 100644 --- a/qa/repository-multi-version/build.gradle +++ b/qa/repository-multi-version/build.gradle @@ -11,7 +11,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index 1e983b6f7a9a..5ef69066ac78 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -11,7 +11,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.rest-resources' diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle index c8c87f22f1d4..d551ecc39a1e 100644 --- a/qa/verify-version-constants/build.gradle +++ b/qa/verify-version-constants/build.gradle @@ -12,7 +12,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) { diff --git a/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle b/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle index 9adab2440ee0..af0d94ec2408 100644 --- a/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle +++ b/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle @@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation(testArtifact(project(xpackModule('core')))) @@ -61,8 +61,6 @@ tasks.register("follow-cluster", RestIntegTestTask) { } tasks.named("check").configure { dependsOn "follow-cluster" } -// no unit tests for multi-cluster-search, only the rest integration test -tasks.named("test").configure { enabled = false } // We can't run in FIPS mode with a basic license tasks.withType(Test).configureEach { diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle index e2e57e23d078..716cb44460d1 100644 --- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle @@ -1,7 +1,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation(testArtifact(project(xpackModule('core')))) @@ -67,5 +67,4 @@ testClusters.matching { it.name == "follow-cluster" }.configureEach { { "\"${testClusters.named('middle-cluster').get().getAllTransportPortURI().join(",")}\"" } } -tasks.named("check").configure { dependsOn "follow-cluster" } -tasks.named("test").configure { enabled = false } // no unit tests for multi-cluster-search, only the rest integration test +tasks.named("check").configure { dependsOn "follow-cluster" } \ No newline at end of file diff --git a/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle b/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle index 27b183cfb474..2507291eff59 100644 --- a/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle +++ b/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle @@ -1,7 +1,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation(testArtifact(project(xpackModule('core')))) @@ -39,5 +39,4 @@ tasks.register('follow-cluster', RestIntegTestTask) { { "${testClusters.'follow-cluster'.getAllHttpSocketURI().get(0)}" } } -tasks.named("check").configure { dependsOn "follow-cluster" } -tasks.named("test").configure { enabled = false } +tasks.named("check").configure { dependsOn "follow-cluster" } \ No newline at end of file diff --git a/x-pack/plugin/ccr/qa/restart/build.gradle b/x-pack/plugin/ccr/qa/restart/build.gradle index 26854cdeb294..742f135b82c2 100644 --- a/x-pack/plugin/ccr/qa/restart/build.gradle +++ b/x-pack/plugin/ccr/qa/restart/build.gradle @@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation project(':x-pack:plugin:ccr:qa') @@ -56,4 +56,3 @@ tasks.register("followClusterRestartTest", StandaloneRestIntegTestTask) { } tasks.named("check").configure { dependsOn "followClusterRestartTest" } -tasks.named("test").configure { enabled = false } diff --git a/x-pack/plugin/ccr/qa/security/build.gradle b/x-pack/plugin/ccr/qa/security/build.gradle index db3dac6b3e54..97590d059594 100644 --- a/x-pack/plugin/ccr/qa/security/build.gradle +++ b/x-pack/plugin/ccr/qa/security/build.gradle @@ -1,7 +1,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation(testArtifact(project(xpackModule('core')))) @@ -54,6 +54,4 @@ tasks.register('follow-cluster', RestIntegTestTask) { nonInputProperties.systemProperty 'tests.leader_host', "${-> testClusters.'leader-cluster'.getAllHttpSocketURI().get(0)}" } -tasks.named("check").configure { dependsOn('follow-cluster') } -// no unit tests for multi-cluster-search, only the rest integration test -tasks.named("test").configure { enabled = false } +tasks.named("check").configure { dependsOn('follow-cluster') } \ No newline at end of file diff --git a/x-pack/plugin/ilm/qa/multi-cluster/build.gradle b/x-pack/plugin/ilm/qa/multi-cluster/build.gradle index 54e61c11be38..09688bd9b2ad 100644 --- a/x-pack/plugin/ilm/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/ilm/qa/multi-cluster/build.gradle @@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' dependencies { testImplementation project(':x-pack:plugin:ccr:qa') @@ -56,10 +56,8 @@ testClusters.matching{ it.name == 'follow-cluster' }.configureEach { } tasks.named("check").configure { dependsOn 'follow-cluster' } -// no unit tests for this module, only the rest integration test -tasks.named("test").configure { enabled = false } // Security is explicitly disabled for follow-cluster and leader-cluster, do not run these in FIPS mode tasks.withType(Test).configureEach { - onlyIf { BuildParams.inFipsJvm == false} + enabled = BuildParams.inFipsJvm == false } diff --git a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle index b3c3d17aba65..b8e5b79e3d47 100644 --- a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle +++ b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle @@ -1,7 +1,7 @@ import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-resources' dependencies { @@ -63,5 +63,4 @@ tasks.register("integTest") { dependsOn 'mixed-cluster' } -tasks.named("test").configure { enabled = false } // no unit tests for multi-cluster-search, only the rest integration test tasks.named("check").configure { dependsOn("integTest") } diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index 68a6b46be659..338a04aa1f6f 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -3,7 +3,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' dependencies { @@ -75,7 +75,6 @@ for (Version bwcVersion : BuildParams.bwcVersions.indexCompatible) { exclude 'org/elasticsearch/upgrades/QueryBuilderBWCIT.class' } - tasks.register("${baseName}#upgradedClusterTest", StandaloneRestIntegTestTask) { mustRunAfter("precommit") useCluster testClusters."${baseName}" diff --git a/x-pack/qa/multi-cluster-search-security/build.gradle b/x-pack/qa/multi-cluster-search-security/build.gradle index 8adab3fe4374..dcc6e3f36e59 100644 --- a/x-pack/qa/multi-cluster-search-security/build.gradle +++ b/x-pack/qa/multi-cluster-search-security/build.gradle @@ -2,7 +2,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-resources' dependencies { @@ -77,5 +77,4 @@ tasks.register("integTest") { dependsOn 'mixed-cluster' } -tasks.named("test").configure { enabled = false } // no unit tests for multi-cluster-search, only the rest integration test tasks.named("check").configure { dependsOn("integTest") } diff --git a/x-pack/qa/rolling-upgrade-basic/build.gradle b/x-pack/qa/rolling-upgrade-basic/build.gradle index 6ca6ffd0febb..037e92992fe9 100644 --- a/x-pack/qa/rolling-upgrade-basic/build.gradle +++ b/x-pack/qa/rolling-upgrade-basic/build.gradle @@ -3,16 +3,12 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' dependencies { testImplementation project(':x-pack:qa') } -if (BuildParams.inFipsJvm){ - // This test is testing rolling upgrades with a BASIC license and FIPS 140 mode is not available in BASIC - tasks.withType(Test).configureEach{ enabled = false } -} for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) { String baseName = "v${bwcVersion}" @@ -87,8 +83,9 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) { // Security is explicitly disabled, do not run tests in FIPS mode tasks.withType(Test).configureEach { - onlyIf { BuildParams.inFipsJvm == false} + enabled = BuildParams.inFipsJvm == false } + tasks.named("testingConventions").configure { - onlyIf { BuildParams.inFipsJvm == false } + enabled = BuildParams.inFipsJvm == false } diff --git a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle index def51537e1f5..4d78bc32880c 100644 --- a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle +++ b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle @@ -3,7 +3,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' dependencies { diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index 25fc7dada67b..b0d4b82ec397 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -3,7 +3,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-testclusters' -apply plugin: 'elasticsearch.standalone-test' +apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.rest-resources'