🔨 Only retry flaky tests when PR is ready for merging #7126
Conversation
GitHK
changed the title
| @@ -24,19 +24,29 @@ queue_rules: | |||
|
|
|||
| # NOTE: in case of flaky tests you above checks will fail | |||
| # the PR will be removed from the queue. | |||
| # This retries the checks, as soon as they become green, | |||
| # the PR will be pusehd to the queu again | |||
| # Once the PR is ready to be merged the flaky tests will | |||
There was a problem hiding this comment.
I would put a limit in retries ...
There was a problem hiding this comment.
I'll investigate If there is a sane way to do this. Currently I did not find any nice solutions
| - "#approved-reviews-by>=2" # Requires 2 approving reviews | ||
| - "#changes-requested-reviews-by=0" # No changes requested | ||
| - "#review-threads-unresolved=0" # All review threads resolved |
There was a problem hiding this comment.
why do you need to define all these things? can't it just check the github PR status?
I find it annoying as these settings are typically defined at the github repository level. now this needs to be duplicated in this file? Actually this also includes draft and conflict. In that case Github would anyway prevent you from merging. can this thing obliterate that fact??? if yes that looks dangerous. if not then I don't see the point in duplicating these settings.
Also other question:
- what about hotfix branches?
There was a problem hiding this comment.
This configuration file is not that clear. Unfortunately I also got very confused on how to use it at first.
This section pull_request_rules has nothing to do with the "Merge Queue" (section queue_rules). This part instructs the "Workflow Automation" part of Mergify to restart PRs whose tests have failed.
The "Merge Queue" part already respects and enforces all checks setup in GitHub.
The "Workflow Automation" does not know anything about these rules, so as a good measure when restarting the CI jobs (due to flaky tests) we check that the PR is ready to be merged.
There was a problem hiding this comment.
For now I want to try this only on the PRs but it can be added to all sorts of branches even hot fix ones. We can have a regex on the name of the branch and if it's a hotfix we let the "Workflow Automation" to restart it.
There was a problem hiding this comment.
ok. but still I don't get why you need to put all the criteria like "approved-reviews-by>=2" for example. this is setup in the settings of github. I don't get why this needs to be there.
…-only-retries-when-pr-is-approved
|
GitHK
changed the title
What do these changes do?
When the PR is ready for merging (all conversations closed, all required approvals have been given and all tests look OK),
Mergifywill take over.It will deal with flaky tests and make sure the code lands on master. It will restart the CI till it becomes green.
Why not let
Mergifyrestart the CI on all fails? What if you have a breaking test? This will cause lots of useless CI runs.Fix: using correct workflow file path
Related issue/s
How to test
Dev-ops checklist