Skip to content

fix: add push retry with rebase to ArgoCD update workflow#1528

Open
andersondario-er wants to merge 1 commit into
developfrom
fix/argocd-push-retry
Open

fix: add push retry with rebase to ArgoCD update workflow#1528
andersondario-er wants to merge 1 commit into
developfrom
fix/argocd-push-retry

Conversation

@andersondario-er
Copy link
Copy Markdown
Contributor

Summary

Concurrent deploys (e.g., das-server + das-web-react releasing at the same time) race when pushing to serca-argocd-apps main, causing cannot lock ref failures.

Changes

  • Retry loop: Wraps git push in _update-argo.yml with retry (up to 5 attempts) using git fetch + rebase between attempts
  • Random jitter: 2-5s random backoff to avoid thundering herd
  • Mirrors the same fix applied to serca-pipelines (PADAS/serca-pipelines#78)

Files Changed

  • .github/workflows/_update-argo.yml — push retry logic

Concurrent deploys can race when pushing to serca-argocd-apps,
causing "cannot lock ref" failures. Adds retry loop (up to 5 attempts)
with fetch + rebase and random jitter to handle contention.
@andersondario-er andersondario-er self-assigned this Apr 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant