From 1edf77c1df6292998e9eb496dd243418af224857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Dematt=C3=A9?= Date: Fri, 20 Jun 2025 20:04:09 +0200 Subject: [PATCH] Mute testSnapshotRestore in bcUpgradeTest (#129767) --- qa/full-cluster-restart/build.gradle | 9 +++++++++ x-pack/qa/full-cluster-restart/build.gradle | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index 16f7abc18342..55881b7b29d2 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -29,6 +29,15 @@ tasks.register("luceneBwcTest", StandaloneRestIntegTestTask) { onlyIf("tests.bwc.main.version system property exists") { System.getProperty("tests.bwc.main.version") != null } } +tasks.named("bcUpgradeTest").configure { + filter { + // Mute testSnapshotRestore: it uses string compare of Version (from the cluster, saved in the snapshot) with tests.bwc.main.version, + // which does not work for SNAPSHOT builds + excludeTestsMatching("org.elasticsearch.upgrades.FullClusterRestartIT.testSnapshotRestore") + excludeTestsMatching("org.elasticsearch.upgrades.FullClusterRestartIT.testSnapshotRestore *") + } +} + tasks.withType(Test).configureEach { // CI doesn't like it when there's multiple clusters running at once maxParallelForks = 1 diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index 1a22c1493958..431c772b923d 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -29,3 +29,12 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName -> maxParallelForks = 1 } } + +tasks.named("bcUpgradeTest").configure { + filter { + // Mute testSnapshotRestore: it uses string compare of Version (from the cluster, saved in the snapshot) with tests.bwc.main.version, + // which does not work for SNAPSHOT builds + excludeTestsMatching("org.elasticsearch.xpack.restart.CoreFullClusterRestartIT.testSnapshotRestore") + excludeTestsMatching("org.elasticsearch.xpack.restart.CoreFullClusterRestartIT.testSnapshotRestore *") + } +}