From 7888006dafd5fc2c46d0285648947525ffb12dc4 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Thu, 5 Jun 2025 14:45:55 +0200 Subject: [PATCH 1/6] Expand bcUpgradeTask to run more test suites. Relates to ES-11904 --- modules/ingest-geoip/qa/full-cluster-restart/build.gradle | 8 ++++++++ qa/full-cluster-restart/build.gradle | 7 +++++++ qa/rolling-upgrade/build.gradle | 5 ----- x-pack/plugin/downsample/qa/mixed-cluster/build.gradle | 8 ++++++++ .../ent-search/qa/full-cluster-restart/build.gradle | 8 ++++++++ x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle | 7 +++++++ x-pack/plugin/inference/qa/mixed-cluster/build.gradle | 6 ++++++ x-pack/plugin/inference/qa/rolling-upgrade/build.gradle | 7 +++++++ x-pack/plugin/security/qa/multi-cluster/build.gradle | 8 ++++++++ .../plugin/shutdown/qa/full-cluster-restart/build.gradle | 8 ++++++++ x-pack/qa/full-cluster-restart/build.gradle | 8 ++++++++ 11 files changed, 75 insertions(+), 5 deletions(-) diff --git a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle index b6613b51ac8fc..0739ab78fa6e1 100644 --- a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle +++ b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle @@ -7,6 +7,7 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -24,3 +25,10 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> systemProperty("tests.old_cluster_version", bwcVersion) } } + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index d23267bb352fc..09c0dbb53a36b 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -28,6 +28,13 @@ tasks.register("luceneBwcTest", StandaloneRestIntegTestTask) { onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } } +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} + tasks.withType(Test).configureEach { // CI doesn't like it when there's multiple clusters running at once maxParallelForks = 1 diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index 9a2fb22da5e39..d0eacd8689ec4 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -31,11 +31,6 @@ tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { usesBwcDistribution(Version.fromString("0.0.0")) systemProperty("tests.old_cluster_version", "0.0.0") onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } - filter { - // filter tests initially for quicker iterations - // TODO remove once expanding the test set to other modules - includeTestsMatching("org.elasticsearch.upgrades.IndexingIT") - } } tasks.withType(Test).configureEach { diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle index 2cf2f602cff46..63d5096389a9c 100644 --- a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle +++ b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask @@ -43,6 +44,13 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN } } +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} + tasks.named("yamlRestTest") { enabled = false } diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle index 1e1973a118074..0befb8ec5df22 100644 --- a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -22,3 +23,10 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion, systemProperty("tests.old_cluster_version", bwcVersion) } } + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle index 321488c8c6c17..0c8767c4ac295 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle @@ -62,6 +62,13 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN } } +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} + tasks.named("yamlRestTest") { enabled = false } diff --git a/x-pack/plugin/inference/qa/mixed-cluster/build.gradle b/x-pack/plugin/inference/qa/mixed-cluster/build.gradle index 0f8c732154e85..3c5f5fbdb5b9d 100644 --- a/x-pack/plugin/inference/qa/mixed-cluster/build.gradle +++ b/x-pack/plugin/inference/qa/mixed-cluster/build.gradle @@ -38,3 +38,9 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN } } +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle index 214d775b46236..e656d3b9fd233 100644 --- a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle +++ b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -27,3 +28,9 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.11.0")) { bwcVersion, } } +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/x-pack/plugin/security/qa/multi-cluster/build.gradle b/x-pack/plugin/security/qa/multi-cluster/build.gradle index f4eee4ef46c02..a2f10f956098f 100644 --- a/x-pack/plugin/security/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/security/qa/multi-cluster/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -43,3 +44,10 @@ buildParams.bwcVersions.withWireCompatible() { bwcVersion, baseName -> include '**/RemoteClusterSecurityBWCToRCS2ClusterRestIT.class' } } + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle index 60b0b372ba14c..306266742d721 100644 --- a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -25,3 +26,10 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> systemProperty("tests.old_cluster_version", bwcVersion) } } + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index ee0955c6db082..eeeaa8a370c09 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -5,6 +5,7 @@ * 2.0. */ +import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' @@ -28,3 +29,10 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> maxParallelForks = 1 } } + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} From 43011688c4efee098b4749d5afbdd7c69b392f4a Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Thu, 5 Jun 2025 16:06:59 +0200 Subject: [PATCH 2/6] remove from downsample, only contains yaml rest tests --- x-pack/plugin/downsample/qa/mixed-cluster/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle index 63d5096389a9c..2cf2f602cff46 100644 --- a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle +++ b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.VersionProperties import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask @@ -44,13 +43,6 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN } } -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} - tasks.named("yamlRestTest") { enabled = false } From e49ca270fca6cc9824709edb76502be26bfa7849 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Fri, 6 Jun 2025 12:45:26 +0200 Subject: [PATCH 3/6] support security for BC upgrade testing which use the magic version number 0.0.0 --- .../elasticsearch/test/cluster/local/LocalClusterSpec.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java index cccf2a95234c9..633381cefbbbb 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java @@ -212,7 +212,12 @@ public Path getConfigDir() { } public boolean isSecurityEnabled() { - return Boolean.parseBoolean(getSetting("xpack.security.enabled", getVersion().onOrAfter("8.0.0") ? "true" : "false")); + return Boolean.parseBoolean( + getSetting( + "xpack.security.enabled", + getVersion().equals(Version.fromString("0.0.0")) || getVersion().onOrAfter("8.0.0") ? "true" : "false" + ) + ); } public boolean isRemoteClusterServerEnabled() { From f2aab12a585654d2ab46b3ee27229ff74fd09a83 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Tue, 10 Jun 2025 16:10:05 +0200 Subject: [PATCH 4/6] extract bc upgrade test registration in script --- .../groovy/elasticsearch.bc-update-test.gradle | 18 ++++++++++++++++++ .../qa/full-cluster-restart/build.gradle | 9 +-------- qa/full-cluster-restart/build.gradle | 8 +------- qa/rolling-upgrade/build.gradle | 8 +------- .../qa/full-cluster-restart/build.gradle | 9 +-------- .../esql/qa/server/mixed-cluster/build.gradle | 8 +------- .../inference/qa/mixed-cluster/build.gradle | 8 +------- .../inference/qa/rolling-upgrade/build.gradle | 9 +-------- .../security/qa/multi-cluster/build.gradle | 8 +------- .../qa/full-cluster-restart/build.gradle | 8 +------- x-pack/qa/full-cluster-restart/build.gradle | 8 +------- 11 files changed, 28 insertions(+), 73 deletions(-) create mode 100644 build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle diff --git a/build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle b/build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle new file mode 100644 index 0000000000000..94702c840c745 --- /dev/null +++ b/build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the "Elastic License + * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side + * Public License v 1"; you may not use this file except in compliance with, at + * your election, the "Elastic License 2.0", the "GNU Affero General Public + * License v3.0 only", or the "Server Side Public License, v 1". + */ + +import org.elasticsearch.gradle.Version +import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask + +tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { + // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property + usesBwcDistribution(Version.fromString("0.0.0")) + systemProperty("tests.old_cluster_version", "0.0.0") + onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } +} diff --git a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle index 0739ab78fa6e1..5f83271ed6242 100644 --- a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle +++ b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle @@ -12,7 +12,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.bwc-test' - +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { javaRestTestImplementation project(':test:fixtures:geoip-fixture') @@ -25,10 +25,3 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> systemProperty("tests.old_cluster_version", bwcVersion) } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index 09c0dbb53a36b..16f7abc183421 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -13,6 +13,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) { @@ -28,13 +29,6 @@ tasks.register("luceneBwcTest", StandaloneRestIntegTestTask) { onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } } -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} - tasks.withType(Test).configureEach { // CI doesn't like it when there's multiple clusters running at once maxParallelForks = 1 diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index d0eacd8689ec4..aef0ea6cdae0a 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -14,6 +14,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-test-artifact-base' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.fwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' testArtifacts { registerTestArtifactFromSourceSet(sourceSets.javaRestTest) @@ -26,13 +27,6 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> } } -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} - tasks.withType(Test).configureEach { // CI doesn't like it when there's multiple clusters running at once maxParallelForks = 1 diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle index 0befb8ec5df22..b5e0d2b67b615 100644 --- a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle @@ -10,7 +10,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.bwc-test' - +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { javaRestTestImplementation(testArtifact(project(xpackModule('core')))) @@ -23,10 +23,3 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion, systemProperty("tests.old_cluster_version", bwcVersion) } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle index 0c8767c4ac295..4f88d4303f108 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle @@ -14,6 +14,7 @@ apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-yaml-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin @@ -62,13 +63,6 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN } } -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} - tasks.named("yamlRestTest") { enabled = false } diff --git a/x-pack/plugin/inference/qa/mixed-cluster/build.gradle b/x-pack/plugin/inference/qa/mixed-cluster/build.gradle index 3c5f5fbdb5b9d..eb775bb096b2e 100644 --- a/x-pack/plugin/inference/qa/mixed-cluster/build.gradle +++ b/x-pack/plugin/inference/qa/mixed-cluster/build.gradle @@ -12,6 +12,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-test-artifact-base' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { javaRestTestImplementation(testArtifact(project(xpackModule('core')))) @@ -37,10 +38,3 @@ buildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseN dependsOn javaRestTest } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle index e656d3b9fd233..9a159475ca6c5 100644 --- a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle +++ b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle @@ -11,7 +11,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-test-artifact-base' apply plugin: 'elasticsearch.bwc-test' - +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { javaRestTestImplementation(testArtifact(project(xpackModule('core')))) @@ -27,10 +27,3 @@ buildParams.bwcVersions.withWireCompatible(v -> v.after("8.11.0")) { bwcVersion, maxParallelForks = 1 } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/x-pack/plugin/security/qa/multi-cluster/build.gradle b/x-pack/plugin/security/qa/multi-cluster/build.gradle index a2f10f956098f..6371333b7cbb9 100644 --- a/x-pack/plugin/security/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/security/qa/multi-cluster/build.gradle @@ -11,6 +11,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { javaRestTestImplementation project(':x-pack:plugin:core') @@ -44,10 +45,3 @@ buildParams.bwcVersions.withWireCompatible() { bwcVersion, baseName -> include '**/RemoteClusterSecurityBWCToRCS2ClusterRestIT.class' } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle index 306266742d721..580802c8098f4 100644 --- a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle @@ -10,6 +10,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { // TODO: Remove core dependency and change tests to not use builders that are part of xpack-core. @@ -26,10 +27,3 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> systemProperty("tests.old_cluster_version", bwcVersion) } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index eeeaa8a370c09..0d186be50c909 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -10,6 +10,7 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.bwc-test' +apply plugin: 'elasticsearch.bc-upgrade-test' dependencies { // TODO: Remove core dependency and change tests to not use builders that are part of xpack-core. @@ -29,10 +30,3 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> maxParallelForks = 1 } } - -tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { - // We use a phony version here as the real version is provided via `tests.bwc.main.version` system property - usesBwcDistribution(Version.fromString("0.0.0")) - systemProperty("tests.old_cluster_version", "0.0.0") - onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } -} From 274ff45a8ad7fd438f5bad2200ac43c7097ead00 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Thu, 12 Jun 2025 10:52:05 +0200 Subject: [PATCH 5/6] rename --- ...bc-update-test.gradle => elasticsearch.bc-upgrade-test.gradle} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build-tools-internal/src/main/groovy/{elasticsearch.bc-update-test.gradle => elasticsearch.bc-upgrade-test.gradle} (100%) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle b/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle similarity index 100% rename from build-tools-internal/src/main/groovy/elasticsearch.bc-update-test.gradle rename to build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle From 31e1450b1f526e58f43084ce7f301a09a0a0c807 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Thu, 12 Jun 2025 11:01:18 +0200 Subject: [PATCH 6/6] remove unneeded imports --- modules/ingest-geoip/qa/full-cluster-restart/build.gradle | 1 - x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle | 1 - x-pack/plugin/inference/qa/rolling-upgrade/build.gradle | 1 - x-pack/plugin/security/qa/multi-cluster/build.gradle | 1 - x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle | 1 - x-pack/qa/full-cluster-restart/build.gradle | 1 - 6 files changed, 6 deletions(-) diff --git a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle index 5f83271ed6242..5be9c652e3e90 100644 --- a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle +++ b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle @@ -7,7 +7,6 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle index b5e0d2b67b615..ab6d803a8211c 100644 --- a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' diff --git a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle index 9a159475ca6c5..0bdc23c0e8600 100644 --- a/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle +++ b/x-pack/plugin/inference/qa/rolling-upgrade/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' diff --git a/x-pack/plugin/security/qa/multi-cluster/build.gradle b/x-pack/plugin/security/qa/multi-cluster/build.gradle index 6371333b7cbb9..6cbabbabe00ce 100644 --- a/x-pack/plugin/security/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/security/qa/multi-cluster/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' diff --git a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle index 580802c8098f4..d2b4219505901 100644 --- a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index 0d186be50c909..1a22c1493958f 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -5,7 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.Version import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test'