From 6df0e3ee2215b5c3eca16f7e2c646cf4947816b8 Mon Sep 17 00:00:00 2001
From: Parker Timmins <parker.timmins@elastic.co>
Date: Thu, 6 Aug 2026 11:37:58 -0500
Subject: [PATCH 1/2] Fix smart-retry gap in rolling-upgrade-legacy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The rolling-upgrade-legacy suite runs its upgrade phases as
separate Gradle tasks (oldClusterTest, oneThirdUpgradedTest,
etc.). Buildkite's smart-retry can skip tasks that passed in a
previous run, but retries start a fresh cluster, so state
created by oldClusterTest is gone when oneThirdUpgradedTest
runs — causing 404s on indices/data-streams that were never
created.

Every other rolling-upgrade project already sets
smartRetry.pruneIndividualTests.set(false) to prevent this;
rolling-upgrade-legacy was simply missing that line.

Unmutes DataStreamsUpgradeIT (3 tests), MLModelDeploymentsUpgradeIT,
and MlAssignmentPlannerUpgradeIT, all muted for this same reason.

Closes #153415
---
 muted-tests.yml                               | 15 ---------------
 x-pack/qa/rolling-upgrade-legacy/build.gradle |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 4050ac36a731a..00eeeff7b531a 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -310,24 +310,9 @@ tests:
 - class: org.elasticsearch.xpack.transform.integration.TransformCrossProjectIT
   method: testUpdateTransformWithProjectRouting
   issue: https://github.com/elastic/elasticsearch/issues/147534
-- class: org.elasticsearch.upgrades.DataStreamsUpgradeIT
-  method: testDataStreamValidationDoesNotBreakUpgrade
-  issue: https://github.com/elastic/elasticsearch/issues/153413
-- class: org.elasticsearch.upgrades.DataStreamsUpgradeIT
-  method: testDataStreams
-  issue: https://github.com/elastic/elasticsearch/issues/153414
-- class: org.elasticsearch.upgrades.DataStreamsUpgradeIT
-  method: testMigrateDoesNotRestartOnUpgrade
-  issue: https://github.com/elastic/elasticsearch/issues/153415
-- class: org.elasticsearch.upgrades.MLModelDeploymentsUpgradeIT
-  method: testTrainedModelDeployment
-  issue: https://github.com/elastic/elasticsearch/issues/153416
 - class: org.elasticsearch.upgrades.IndexingIT
   method: testIndexing
   issue: https://github.com/elastic/elasticsearch/issues/140728
-- class: org.elasticsearch.upgrades.MlAssignmentPlannerUpgradeIT
-  method: testMlAssignmentPlannerUpgrade
-  issue: https://github.com/elastic/elasticsearch/issues/153417
 - class: org.elasticsearch.xpack.transform.checkpoint.TransformGetCheckpointIT
   method: testGetCheckpointTimeoutExceeded
   issue: https://github.com/elastic/elasticsearch/issues/150934
diff --git a/x-pack/qa/rolling-upgrade-legacy/build.gradle b/x-pack/qa/rolling-upgrade-legacy/build.gradle
index 036cc5091a962..e0793eb756c99 100644
--- a/x-pack/qa/rolling-upgrade-legacy/build.gradle
+++ b/x-pack/qa/rolling-upgrade-legacy/build.gradle
@@ -13,6 +13,10 @@ apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.bwc-test'
 apply plugin: 'elasticsearch.rest-resources'
 
+// Each suite is parameterized over the upgrade phases and an earlier phase sets up the cluster state a later phase asserts on,
+// so a phase that passed must still run when a later phase is retried.
+smartRetry.pruneIndividualTests.set(false)
+
 dependencies {
   testImplementation testArtifact(project(':server'))
   testImplementation testArtifact(project(xpackModule('core')))

From 4f407d206bd8a0f32ea2f28ec1fb27e21ff2e727 Mon Sep 17 00:00:00 2001
From: Parker Timmins <parker.timmins@elastic.co>
Date: Thu, 6 Aug 2026 11:56:28 -0500
Subject: [PATCH 2/2] add unmute

---
 muted-tests.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 00eeeff7b531a..e93b81c279d0a 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -391,9 +391,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
   method: test {feature:BASELINE}
   issue: https://github.com/elastic/elasticsearch/issues/154058
-- class: org.elasticsearch.upgrades.DataStreamsUpgradeIT
-  method: testUpgradeDataStream
-  issue: https://github.com/elastic/elasticsearch/issues/154593
 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
   method: test {p0=indices.sort/30_multi_value/Index Sort with doc_values multi_value false - integer}
   issue: https://github.com/elastic/elasticsearch/issues/154602