Skip to content

🐛 [fix] merge-gate: rerun a failed verify on the same tree before a rebase pass - #108

Open
chadhuskops wants to merge 1 commit into
EricTechPro:mainfrom
chadhuskops:fix/merge-gate-verify-retry
Open

chadhuskops wants to merge 1 commit into
EricTechPro:mainfrom
chadhuskops:fix/merge-gate-verify-retry

Conversation

@chadhuskops

Copy link
Copy Markdown

Note

⏳ Ready for review · ✅ 4/4 AC · head faaf81b

Problem

  • Where: scripts/super-board-merge-gate.sh, the verify step before merge
    • a. A timing-flaky test fails verify once at the gate
    • b. The gate exits 2, and the card bounces for a rebase pass
    • c. The rebuilt PR is identical, and the same test passes
  • Who: any board with a flaky test
  • What happened: seen in a downstream run. A full Build round was spent on a PR that needed no change

Solution

  • New config key verify_retries (default 1). A failed verify command reruns up to that many times on the same tree, with no rebuild and no new commit
  • A pass on retry prints flaky: <command> on stdout and merges. Failing every try still exits 2. verify_retries: 0 keeps today's behaviour. A non-integer exits 64
  • config-schema.json, run.md (exit 2 routing) and project-checks.md document it

Acceptance criteria

  • A flake that passes on retry merges and prints flaky:
    ↳ tests/test-merge-gate.sh scenario 26
  • verify_retries: 2 runs the command three times; 0 keeps exit 2 on the first failure
    ↳ scenarios 27, 28
  • A bad verify_retries exits 64
    ↳ scenario 29
  • New cases fail on main and pass here
    ↳ bash tests/test-merge-gate.sh · fails at scenario 26 with d0b7d5a's script; PASS now. test-run-gates.sh, test_writing_format.py pass

Risk

🟡 Medium · merge path.

  • Door: two-way · set verify_retries: 0, or revert
  • Blast radius: merge gate · a test that fails then passes on the same tree now merges, with flaky: in the output so the test can be fixed

…ebase pass

- new config key verify_retries (default 1, 0 = old behaviour) reruns a failed verify command on the same head and base, no rebuild
- a pass on retry prints `flaky: <command>` on stdout and merges; failing every try still exits 2
- seen in a downstream run: a timing-flaky test failed verify once, the card bounced to Build and the rebuilt PR was identical
- config-schema.json, run.md (exit 2 routing) and project-checks.md document it; test-merge-gate.sh scenarios 26-29
@qodo-code-review

Copy link
Copy Markdown

Qodo reviews are paused for this user.

Troubleshooting steps vary by plan Learn more →

On a Teams plan?
Reviews resume once this user has a paid seat and their Git account is linked in Qodo.
Link Git account →

Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center?
These require an Enterprise plan - Contact us
Contact us →

This branch has not been deployed

No deployments
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.

2 participants