Change test clusters configuration to support bcUpgradeTest explicitly

Added
`.detachedVersion(System.getProperty("tests.bwc.refspec.main") != null)`
to all the tests which apply 'elasticsearch.bc-upgrade-test' plugin to
make them properly resolve distribution (previously configured by
specifying `0.0.0` version).

Author: jozala

modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java

@@ -42,6 +42,7 @@ public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCas
     private static final ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .version(Version.fromString(OLD_CLUSTER_VERSION))
+        .detachedVersion(isOldClusterDetachedVersion())
         .nodes(2)
         .setting("ingest.geoip.downloader.endpoint", () -> fixture.getAddress(), s -> useFixture)
         .setting("xpack.security.enabled", "false")

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartArchivedSettingsIT.java

@@ -46,6 +46,7 @@ public class FullClusterRestartArchivedSettingsIT extends ParameterizedFullClust
     private static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .version(Version.fromString(OLD_CLUSTER_VERSION))
+        .detachedVersion(isOldClusterDetachedVersion())
         .nodes(2)
         .setting("path.repo", () -> repoDirectory.getRoot().getPath())
         .setting("xpack.security.enabled", "false")

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java

@@ -51,6 +51,7 @@ private static ElasticsearchCluster buildCluster() {
         var cluster = ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .version(Version.fromString(OLD_CLUSTER_VERSION))
+            .detachedVersion(isOldClusterDetachedVersion())
             .nodes(2)
             .setting("xpack.security.enabled", "false")
             .setting("indices.lifecycle.poll_interval", "5s")

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

@@ -110,6 +110,7 @@ private static ElasticsearchCluster buildCluster() {
         var cluster = ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .version(Version.fromString(OLD_CLUSTER_VERSION))
+            .detachedVersion(isOldClusterDetachedVersion())
             .nodes(2)
             .setting("path.repo", () -> repoDirectory.getRoot().getPath())
             .setting("xpack.security.enabled", "false")

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/LogsIndexModeFullClusterRestartIT.java

@@ -40,6 +40,7 @@ private static ElasticsearchCluster buildCluster() {
         var cluster = ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
             .version(Version.fromString(OLD_CLUSTER_VERSION))
+            .detachedVersion(isOldClusterDetachedVersion())
             .module("constant-keyword")
             .module("data-streams")
             .module("mapper-extras")

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/QueryBuilderBWCIT.java

@@ -74,6 +74,7 @@ public class QueryBuilderBWCIT extends ParameterizedFullClusterRestartTestCase {
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .version(org.elasticsearch.test.cluster.util.Version.fromString(OLD_CLUSTER_VERSION))
+        .detachedVersion(isOldClusterDetachedVersion())
         .nodes(2)
         .setting("xpack.security.enabled", "false")
         .apply(() -> clusterConfig)

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedRollingUpgradeTestCase.java

@@ -149,14 +149,6 @@ protected static String getOldClusterVersion() {
         return System.getProperty("tests.bwc.main.version", OLD_CLUSTER_VERSION);
     }
 
-    /**
-     * Whether the old cluster version is not of the released versions, but a detached build.
-     * In that case the Git ref has to be specified via {@code tests.bwc.refspec.main} system property.
-     */
-    protected static boolean isOldClusterDetachedVersion() {
-        return System.getProperty("tests.bwc.refspec.main") != null;
-    }
-
     protected static boolean isOldClusterVersion(String nodeVersion, String buildHash) {
         if (isOldClusterDetachedVersion()) {
             return System.getProperty("tests.bwc.refspec.main").equals(buildHash);

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -364,6 +364,14 @@ protected static boolean testFeatureServiceInitialized() {
         return testFeatureService != ALL_FEATURES;
     }
 
+    /**
+     * Whether the old cluster version is not of the released versions, but a detached build.
+     * In that case the Git ref has to be specified via {@code tests.bwc.refspec.main} system property.
+     */
+    protected static boolean isOldClusterDetachedVersion() {
+        return System.getProperty("tests.bwc.refspec.main") != null;
+    }
+
     @BeforeClass
     public static void initializeProjectIds() {
         // The active project-id is slightly longer, and has a fixed prefix so that it's easier to pick in error messages etc.

x-pack/plugin/ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application/FullClusterRestartIT.java

@@ -42,6 +42,7 @@ public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCas
     public static final ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .version(org.elasticsearch.test.cluster.util.Version.fromString(OLD_CLUSTER_VERSION))
+        .detachedVersion(isOldClusterDetachedVersion())
         .nodes(2)
         .setting("xpack.security.enabled", "false")
         .setting("xpack.license.self_generated.type", "trial")

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/Clusters.java

@@ -14,11 +14,12 @@
 public class Clusters {
     public static ElasticsearchCluster mixedVersionCluster() {
         Version oldVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
+        boolean isDetachedVersion = System.getProperty("tests.bwc.refspec.main") != null;
         var cluster = ElasticsearchCluster.local()
             .distribution(DistributionType.DEFAULT)
-            .withNode(node -> node.version(oldVersion))
+            .withNode(node -> node.version(oldVersion).detachedVersion(isDetachedVersion))
             .withNode(node -> node.version(Version.CURRENT))
-            .withNode(node -> node.version(oldVersion))
+            .withNode(node -> node.version(oldVersion).detachedVersion(isDetachedVersion))
             .withNode(node -> node.version(Version.CURRENT))
             .setting("xpack.security.enabled", "false")
             .setting("xpack.license.self_generated.type", "trial");