Don't run mixed cluster tests against the current version (#115377) (#115379)

mark-vieira · web-flow · commit d1b839e1669a · 2024-10-23T12:48:38.000+11:00
By definition a "mixed cluster" has nodes of two different versions of
Elasticsearch. It doesn't make sense to run these tests against the
current version of Elasticsearch.
diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import org.elasticsearch.gradle.Version
+import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -26,7 +26,7 @@ restResources {
 }
 
 def supportedVersion = bwcVersion -> {
-  return bwcVersion.onOrAfter("8.10.0");
+  return bwcVersion.onOrAfter("8.10.0") && bwcVersion != VersionProperties.elasticsearchVersion
 }
 
 BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->
diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle
@@ -1,5 +1,6 @@
 
 import org.elasticsearch.gradle.Version
+import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.util.GradleUtils
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
@@ -27,7 +28,7 @@ GradleUtils.extendSourceSet(project, "javaRestTest", "yamlRestTest")
 
 // ESQL is available in 8.11 or later
 def supportedVersion = bwcVersion -> {
-  return bwcVersion.onOrAfter(Version.fromString("8.11.0"));
+  return bwcVersion.onOrAfter(Version.fromString("8.11.0")) && bwcVersion != VersionProperties.elasticsearchVersion
 }
 
 BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->
diff --git a/x-pack/plugin/inference/qa/mixed-cluster/build.gradle b/x-pack/plugin/inference/qa/mixed-cluster/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 
 // inference is available in 8.11 or later
 def supportedVersion = bwcVersion -> {
-  return bwcVersion.onOrAfter(Version.fromString("8.11.0"));
+  return bwcVersion.onOrAfter(Version.fromString("8.11.0")) && bwcVersion != VersionProperties.elasticsearchVersion
 }
 
 BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* 2.0.`
`6`	`6`	`*/`
`7`	`7`
`8`		`-import org.elasticsearch.gradle.Version`
	`8`	`+import org.elasticsearch.gradle.VersionProperties`
`9`	`9`	`import org.elasticsearch.gradle.internal.info.BuildParams`
`10`	`10`	`import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask`
`11`	`11`
`@@ -26,7 +26,7 @@ restResources {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`def supportedVersion = bwcVersion -> {`
`29`		`- return bwcVersion.onOrAfter("8.10.0");`
	`29`	`+ return bwcVersion.onOrAfter("8.10.0") && bwcVersion != VersionProperties.elasticsearchVersion`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ dependencies {`
`20`	`20`
`21`	`21`	`// inference is available in 8.11 or later`
`22`	`22`	`def supportedVersion = bwcVersion -> {`
`23`		`- return bwcVersion.onOrAfter(Version.fromString("8.11.0"));`
	`23`	`+ return bwcVersion.onOrAfter(Version.fromString("8.11.0")) && bwcVersion != VersionProperties.elasticsearchVersion`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->`