Skip to content

fix(gitops-update): add retry with rebase and exponential backoff on push #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bedatty merged 1 commit into from
Apr 1, 2026
+19 −1
Merged

fix(gitops-update): add retry with rebase and exponential backoff on push #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion .github/workflows/gitops-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,25 @@ jobs:
fi

git commit -am "ci(${{ steps.setup.outputs.commit_prefix }}): update image tags ($ENV_LABEL)" || echo "No changes to commit"
git push origin main

# Retry push with rebase and exponential backoff to handle concurrent updates
MAX_RETRIES=5
for i in $(seq 1 $MAX_RETRIES); do
if git push origin main; then
echo "Push succeeded on attempt $i"
break
fi

if [ "$i" -eq "$MAX_RETRIES" ]; then
echo "ERROR: Failed to push after $MAX_RETRIES attempts"
exit 1
fi

BACKOFF=$((i * 2))
echo "Push failed (attempt $i/$MAX_RETRIES), rebasing and retrying in ${BACKOFF}s..."
sleep "$BACKOFF"
git pull --rebase origin main
done

# ArgoCD Sync Job - runs in parallel for each server/env combination
argocd_sync:
Expand Down
Loading