Merge branch 'main' into blkfac_internal_aggs

ChrisHegarty · Oct 2, 2023 · 4e83282 · 4e83282
2 parents 052b3f6 + a12315f
commit 4e83282
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java b/modules/rest-root/src/test/java/org/elasticsearch/rest/root/MainResponseTests.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
-import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -35,19 +34,19 @@ protected MainResponse createTestInstance() {
         String clusterUuid = randomAlphaOfLength(10);
         ClusterName clusterName = new ClusterName(randomAlphaOfLength(10));
         String nodeName = randomAlphaOfLength(10);
-        Version version = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
+        String versionString = randomAlphaOfLength(10);
         IndexVersion indexVersion = IndexVersionUtils.randomVersion();
         Build build = newBuild(
             Build.current(),
             Map.of(
                 "version",
-                version.toString(),
+                versionString,
                 "minWireCompatVersion",
-                version.minimumCompatibilityVersion().toString(),
+                randomAlphaOfLength(10),
                 "minIndexCompatVersion",
                 Build.minimumCompatString(IndexVersion.getMinimumCompatibleIndexVersion(indexVersion.id())),
                 "displayString",
-                Build.defaultDisplayString(Build.current().type(), Build.current().hash(), Build.current().date(), version.toString())
+                Build.defaultDisplayString(Build.current().type(), Build.current().hash(), Build.current().date(), versionString)
             )
         );
         return new MainResponse(nodeName, indexVersion.luceneVersion().toString(), clusterName, clusterUuid, build);

diff --git a/...luster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/...luster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
@@ -1869,7 +1869,7 @@ public void testTransportCompressionSetting() throws IOException {
         assumeTrue("the old transport.compress setting existed before 7.14", getOldClusterVersion().before(Version.V_7_14_0));
         assumeTrue(
             "Early versions of 6.x do not have cluster.remote* prefixed settings",
-            getOldClusterVersion().onOrAfter(Version.V_7_14_0.minimumCompatibilityVersion())
+            getOldClusterVersion().onOrAfter(Version.fromString("6.8.0"))
         );
         if (isRunningAgainstOldCluster()) {
             final Request putSettingsRequest = new Request("PUT", "/_cluster/settings");