Skip to content

Fix smart-retry gap in rolling-upgrade-legacy - #156078

Merged
parkertimmins merged 3 commits into
elastic:mainfrom
parkertimmins:fix/rolling-upgrade-legacy-smart-retry
Aug 10, 2026
Merged

Fix smart-retry gap in rolling-upgrade-legacy#156078
parkertimmins merged 3 commits into
elastic:mainfrom
parkertimmins:fix/rolling-upgrade-legacy-smart-retry

Conversation

@parkertimmins

@parkertimmins parkertimmins commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Problem

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

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

Fix

Add smartRetry.pruneIndividualTests.set(false) to rolling-upgrade-legacy/build.gradle.

Unmutes five tests that were muted for this exact reason:
#153413
#153414
#153415
#153416
#153417
#154593

Closes #153413
Closes #153414
Closes #153415
Closes #153416
Closes #153417
Closes #154593

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 elastic#153415
@elasticsearchmachine elasticsearchmachine added v9.6.0 needs:triage Requires assignment of a team area label labels Aug 6, 2026
@parkertimmins parkertimmins added >test Issues or PRs that are addressing/adding tests :StorageEngine/Data streams Data streams and their lifecycles and removed needs:triage Requires assignment of a team area label labels Aug 6, 2026
@elasticsearchmachine

Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-storage-engine (Team:StorageEngine)

@parkertimmins parkertimmins added auto-backport Automatically create backport pull requests when merged v9.5.1 labels Aug 6, 2026

@jordan-powers jordan-powers left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into this!

@jordan-powers

Copy link
Copy Markdown
Contributor

Could you add #154593 to the unmutes? Looks like it'll also be fixed by this

@parkertimmins
parkertimmins enabled auto-merge (squash) August 6, 2026 17:03
@parkertimmins
parkertimmins merged commit 9dec173 into elastic:main Aug 10, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged :StorageEngine/Data streams Data streams and their lifecycles Team:StorageEngine >test Issues or PRs that are addressing/adding tests v9.5.1 v9.6.0

Projects

None yet

3 participants