workflows: Add retry logic for helm chart PR merge#43585
Merged
Conversation
Add retry mechanism to handle concurrent patch releases when merging helm chart PRs. When a merge fails (e.g., due to conflicts from simultaneous patch releases), the workflow will re-run the release tool to update the PR with the latest changes and re-try 3 more times. The retry logic ensures that transient merge failures due to race conditions between concurrent releases are automatically resolved without manual intervention. Signed-off-by: André Martins <andre@cilium.io>
Member
Author
|
/test |
Artyop
approved these changes
Jan 7, 2026
Contributor
Artyop
left a comment
There was a problem hiding this comment.
I'm not familiar with the race condition issue on multiple releases, the technical part of the retry mechanism lgtm
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
3 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.
Add retry mechanism to handle concurrent patch releases when merging helm chart PRs. When a merge fails (e.g., due to conflicts from simultaneous patch releases), the workflow will re-run the release tool to update the PR with the latest changes and re-try 3 more times.
The retry logic ensures that transient merge failures due to race conditions between concurrent releases are automatically resolved without manual intervention.