From e6ba67f97357da6d6fd81dbfa011170a792201ee Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Tue, 11 Jan 2022 14:27:56 -0800 Subject: [PATCH] Limit full cluster restart upgrade tests to wire compatible versions (#82445) --- .../org/elasticsearch/gradle/internal/BwcVersions.java | 8 ++++---- .../gradle/internal/test/DistroTestPlugin.java | 4 ++-- qa/ccs-rolling-upgrade-remote-cluster/build.gradle | 2 +- qa/full-cluster-restart/build.gradle | 2 +- qa/mixed-cluster/build.gradle | 2 +- qa/repository-multi-version/build.gradle | 2 +- qa/rolling-upgrade/build.gradle | 2 +- qa/verify-version-constants/build.gradle | 2 +- x-pack/plugin/eql/qa/mixed-node/build.gradle | 4 ++-- .../plugin/shutdown/qa/full-cluster-restart/build.gradle | 2 +- x-pack/plugin/shutdown/qa/rolling-upgrade/build.gradle | 2 +- x-pack/plugin/sql/qa/jdbc/build.gradle | 2 +- x-pack/plugin/sql/qa/mixed-node/build.gradle | 2 +- x-pack/qa/full-cluster-restart/build.gradle | 2 +- x-pack/qa/mixed-tier-cluster/build.gradle | 2 +- x-pack/qa/rolling-upgrade-basic/build.gradle | 2 +- x-pack/qa/rolling-upgrade-multi-cluster/build.gradle | 2 +- x-pack/qa/rolling-upgrade/build.gradle | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java index e927565059c2..2c9aaeef7714 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java @@ -236,11 +236,11 @@ public class BwcVersions { ); } - public void withIndexCompatiple(BiConsumer versionAction) { + public void withIndexCompatible(BiConsumer versionAction) { getIndexCompatible().forEach(v -> versionAction.accept(v, "v" + v.toString())); } - public void withIndexCompatiple(Predicate filter, BiConsumer versionAction) { + public void withIndexCompatible(Predicate filter, BiConsumer versionAction) { getIndexCompatible().stream().filter(filter).forEach(v -> versionAction.accept(v, "v" + v.toString())); } @@ -250,11 +250,11 @@ public class BwcVersions { ); } - public void withWireCompatiple(BiConsumer versionAction) { + public void withWireCompatible(BiConsumer versionAction) { getWireCompatible().forEach(v -> versionAction.accept(v, "v" + v.toString())); } - public void withWireCompatiple(Predicate filter, BiConsumer versionAction) { + public void withWireCompatible(Predicate filter, BiConsumer versionAction) { getWireCompatible().stream().filter(filter).forEach(v -> versionAction.accept(v, "v" + v.toString())); } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java index 16c531113410..1caa6671112f 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java @@ -132,7 +132,7 @@ public class DistroTestPlugin implements Plugin { lifecycleTasks.get(distribution.getType()).configure(t -> t.dependsOn(destructiveTask)); if ((distribution.getType() == DEB || distribution.getType() == RPM) && distribution.getBundledJdk()) { - for (Version version : BuildParams.getBwcVersions().getIndexCompatible()) { + for (Version version : BuildParams.getBwcVersions().getWireCompatible()) { final ElasticsearchDistribution bwcDistro; if (version.equals(Version.fromString(distribution.getVersion()))) { // this is the same as the distribution we are testing @@ -248,7 +248,7 @@ public class DistroTestPlugin implements Plugin { private static Map> versionTasks(Project project, String taskPrefix) { Map> versionTasks = new HashMap<>(); - for (Version version : BuildParams.getBwcVersions().getIndexCompatible()) { + for (Version version : BuildParams.getBwcVersions().getWireCompatible()) { versionTasks.put(version.toString(), project.getTasks().register(taskPrefix + ".v" + version)); } diff --git a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle index c975065f1bcd..6d5ed3cebd35 100644 --- a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle +++ b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle @@ -18,7 +18,7 @@ dependencies { testImplementation project(':client:rest-high-level') } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> /** * We execute tests 3 times. diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index db889c4788d0..d7f4c6c60913 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' -BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { versions = [bwcVersion.toString(), project.version] numberOfNodes = 2 diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle index 19ac2adfaf98..7f9d1e57adeb 100644 --- a/qa/mixed-cluster/build.gradle +++ b/qa/mixed-cluster/build.gradle @@ -21,7 +21,7 @@ restResources { } } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> if (bwcVersion != VersionProperties.getElasticsearchVersion()) { /* This project runs the core REST tests against a 4 node cluster where two of diff --git a/qa/repository-multi-version/build.gradle b/qa/repository-multi-version/build.gradle index c626a7573b6b..0b9bad2b705c 100644 --- a/qa/repository-multi-version/build.gradle +++ b/qa/repository-multi-version/build.gradle @@ -19,7 +19,7 @@ dependencies { testImplementation project(':client:rest-high-level') } -BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> String oldClusterName = "${baseName}-old" String newClusterName = "${baseName}-new" diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index beffb18db7a0..b5c4d5b99f3f 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' apply plugin: 'elasticsearch.rest-resources' -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> /* * The goal here is to: *
    diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle index ab6b81e6f5fd..b211a5db4111 100644 --- a/qa/verify-version-constants/build.gradle +++ b/qa/verify-version-constants/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'elasticsearch.internal-testclusters' apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.bwc-test' -BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { version = bwcVersion.toString() setting 'xpack.security.enabled', 'true' diff --git a/x-pack/plugin/eql/qa/mixed-node/build.gradle b/x-pack/plugin/eql/qa/mixed-node/build.gradle index a8189f82f958..8d3719cad5f2 100644 --- a/x-pack/plugin/eql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/eql/qa/mixed-node/build.gradle @@ -15,7 +15,7 @@ dependencies { tasks.named("integTest").configure { enabled = false } -BuildParams.bwcVersions.withWireCompatiple(v -> v.onOrAfter("7.10.0") && +BuildParams.bwcVersions.withWireCompatible(v -> v.onOrAfter("7.10.0") && v != VersionProperties.getElasticsearchVersion()) { bwcVersion, baseName -> def cluster = testClusters.register(baseName) { versions = [bwcVersion.toString(), project.version] @@ -49,4 +49,4 @@ BuildParams.bwcVersions.withWireCompatiple(v -> v.onOrAfter("7.10.0") && tasks.register(bwcTaskName(bwcVersion)) { dependsOn "${baseName}#mixedClusterTest" } -} \ No newline at end of file +} 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 4b92b1068a9e..2f6e8e918c59 100644 --- a/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle +++ b/x-pack/plugin/shutdown/qa/full-cluster-restart/build.gradle @@ -29,7 +29,7 @@ tasks.register("copyTestNodeKeyMaterial", Copy) { into outputDir } -BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { testDistribution = "DEFAULT" versions = [bwcVersion.toString(), project.version] diff --git a/x-pack/plugin/shutdown/qa/rolling-upgrade/build.gradle b/x-pack/plugin/shutdown/qa/rolling-upgrade/build.gradle index 76e283d1eca5..0c0cd7b8650e 100644 --- a/x-pack/plugin/shutdown/qa/rolling-upgrade/build.gradle +++ b/x-pack/plugin/shutdown/qa/rolling-upgrade/build.gradle @@ -37,7 +37,7 @@ tasks.register("copyTestNodeKeyMaterial", Copy) { into outputDir } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> String oldVersion = bwcVersion.toString() // SearchableSnapshotsRollingUpgradeIT uses a specific repository to not interfere with other tests diff --git a/x-pack/plugin/sql/qa/jdbc/build.gradle b/x-pack/plugin/sql/qa/jdbc/build.gradle index 3d327306d8e0..ddfacc810f86 100644 --- a/x-pack/plugin/sql/qa/jdbc/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/build.gradle @@ -71,7 +71,7 @@ subprojects { } // Configure compatibility testing tasks - BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> + BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> // Compatibility testing for JDBC driver started with version 7.9.0 if (bwcVersion.onOrAfter(Version.fromString("7.9.0")) && (bwcVersion.equals(VersionProperties.elasticsearchVersion) == false)) { UnreleasedVersionInfo unreleasedVersion = BuildParams.bwcVersions.unreleasedInfo(bwcVersion) diff --git a/x-pack/plugin/sql/qa/mixed-node/build.gradle b/x-pack/plugin/sql/qa/mixed-node/build.gradle index 12ced73d2521..7543bc28026c 100644 --- a/x-pack/plugin/sql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/sql/qa/mixed-node/build.gradle @@ -21,7 +21,7 @@ testClusters.configureEach { tasks.named("integTest").configure{ enabled = false} // A bug (https://github.com/elastic/elasticsearch/issues/68439) limits us to perform tests with versions from 7.10.3 onwards -BuildParams.bwcVersions.withWireCompatiple(v -> v.onOrAfter("7.10.3") && +BuildParams.bwcVersions.withWireCompatible(v -> v.onOrAfter("7.10.3") && v != VersionProperties.getElasticsearchVersion()) { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index 757f0caae628..e4e0e459ee8a 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -29,7 +29,7 @@ tasks.register("copyTestNodeKeyMaterial", Copy) { into outputDir } -BuildParams.bwcVersions.withIndexCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { testDistribution = "DEFAULT" versions = [bwcVersion.toString(), project.version] diff --git a/x-pack/qa/mixed-tier-cluster/build.gradle b/x-pack/qa/mixed-tier-cluster/build.gradle index 8fbb0f88d128..a42c239b0647 100644 --- a/x-pack/qa/mixed-tier-cluster/build.gradle +++ b/x-pack/qa/mixed-tier-cluster/build.gradle @@ -12,7 +12,7 @@ dependencies { } // Only run tests for 7.9+, since the node.roles setting was introduced in 7.9.0 -BuildParams.bwcVersions.withWireCompatiple(v -> v.onOrAfter("7.9.0") && +BuildParams.bwcVersions.withWireCompatible(v -> v.onOrAfter("7.9.0") && v != VersionProperties.getElasticsearchVersion()) { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { diff --git a/x-pack/qa/rolling-upgrade-basic/build.gradle b/x-pack/qa/rolling-upgrade-basic/build.gradle index fd1577052f87..4f63b440d5b5 100644 --- a/x-pack/qa/rolling-upgrade-basic/build.gradle +++ b/x-pack/qa/rolling-upgrade-basic/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(':x-pack:qa') } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> def baseCluster = testClusters.register(baseName) { testDistribution = "DEFAULT" versions = [bwcVersion.toString(), project.version] diff --git a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle index 9cb9ab23b1c9..2c706c1741db 100644 --- a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle +++ b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(':x-pack:qa') } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> def baseLeaderCluster = testClusters.register("${baseName}-leader") { numberOfNodes = 3 diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index 1ae1f7f9e1dc..93a9a99ce3e3 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -30,7 +30,7 @@ tasks.register("copyTestNodeKeyMaterial", Copy) { into outputDir } -BuildParams.bwcVersions.withWireCompatiple { bwcVersion, baseName -> +BuildParams.bwcVersions.withWireCompatible { bwcVersion, baseName -> String oldVersion = bwcVersion.toString() // SearchableSnapshotsRollingUpgradeIT uses a specific repository to not interfere with other tests