From d58f009d145ce540c081d19d15e5b161420903eb Mon Sep 17 00:00:00 2001 From: ChrisHegarty Date: Wed, 18 Jun 2025 17:51:45 +0100 Subject: [PATCH 1/3] TEST_INDEX_VERSION_DO_NOT_MERGE --- server/src/main/java/org/elasticsearch/index/IndexVersions.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java index 3b4c7e633efb8..e9d23ed157c10 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexVersions.java +++ b/server/src/main/java/org/elasticsearch/index/IndexVersions.java @@ -173,6 +173,7 @@ private static Version parseUnchecked(String version) { public static final IndexVersion SEQ_NO_WITHOUT_POINTS = def(9_027_0_00, Version.LUCENE_10_2_1); public static final IndexVersion INDEX_INT_SORT_INT_TYPE = def(9_028_0_00, Version.LUCENE_10_2_1); public static final IndexVersion MAPPER_TEXT_MATCH_ONLY_MULTI_FIELDS_DEFAULT_NOT_STORED = def(9_029_0_00, Version.LUCENE_10_2_1); + public static final IndexVersion TEST_INDEX_VERSION_DO_NOT_MERGE = def(9_030_0_00, Version.LUCENE_10_2_1); /* * STOP! READ THIS FIRST! No, really, From 1efd8f315b9033250e7162308ef827f1ea4a2ffa Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 20 Jun 2025 10:15:47 +0200 Subject: [PATCH 2/3] Mute testSnapshotRestore --- .../src/main/groovy/elasticsearch.bc-upgrade-test.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle b/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle index 94702c840c745..7c03897617850 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle @@ -15,4 +15,9 @@ 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 { + // Mute problematic tests + excludeTestsMatching("org.elasticsearch.upgrades.FullClusterRestartIT.testSnapshotRestore") + excludeTestsMatching("org.elasticsearch.xpack.restart.CoreFullClusterRestartIT.testSnapshotRestore") + } } From 312e421b33146599c1be68292f910896d0cac5b9 Mon Sep 17 00:00:00 2001 From: Lorenzo Dematte Date: Fri, 20 Jun 2025 12:09:09 +0200 Subject: [PATCH 3/3] More mute testSnapshotRestore --- .../src/main/groovy/elasticsearch.bc-upgrade-test.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle b/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle index 7c03897617850..70c2c63eadbab 100644 --- a/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle +++ b/build-tools-internal/src/main/groovy/elasticsearch.bc-upgrade-test.gradle @@ -18,6 +18,8 @@ tasks.register("bcUpgradeTest", StandaloneRestIntegTestTask) { filter { // Mute problematic tests excludeTestsMatching("org.elasticsearch.upgrades.FullClusterRestartIT.testSnapshotRestore") + excludeTestsMatching("org.elasticsearch.upgrades.FullClusterRestartIT.testSnapshotRestore *") excludeTestsMatching("org.elasticsearch.xpack.restart.CoreFullClusterRestartIT.testSnapshotRestore") + excludeTestsMatching("org.elasticsearch.xpack.restart.CoreFullClusterRestartIT.testSnapshotRestore *") } }