Ensure summary step will retry failed tests#390
Merged
Conversation
ianks
force-pushed
the
ianks/fix-manual-retry
branch
from
bba87b4 to
631e441
Compare
thadcraft-shopify
approved these changes
Apr 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, when Buildkite automatically retried a step (LSO), ci-queue would find the main queue already exhausted and exit 0 -- making the step appear green. But the error reports from the first run were still sitting in Redis, so the separate "Post Merge Testing Summary" (
reportcommand) would still fail. The retry had done nothing.The root cause:
manual_retry?gates the retry-queue path onBUILDKITE_RETRY_TYPE == "manual", so automatic retries were never re-running the failed tests.This PR adds an
elsifbranch that catches the automatic case: ifretry?is true and there are unresolved failures in the build record, we run the retry queue the same way manual retries do. If the test passes on automatic retry, the error report gets cleared and the summary step succeeds. If it fails again, the failure still shows up -- we're not suppressing anything.Two new integration tests cover both paths.