ci: only satisfy pre-checks once merge requested #8275
Merged
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.
Description
#8253 left in place the cancellation of any concurrent pull request integration test, because of #6466
Unfortunately that resulted in mergify offboarding a PR that had been labelled
force:integration
right when adding anautomerge:
label because:automerge:
label immediately satisfied the merge strategy chosen checks, and thus onboarded the PR onto the queuewait-integration-pre-checks
check was already marked as success because of theforce:integration
labelintegration-test-result
check statusIntegration tests
integration-test-result
reported a failure because of the run cancellation (we need that behavior to solve Mergify stall on getting-started local-npm failure #6014 and Failed GH Action reports as skipped, bypassing merge checks #7126)This PR tweaks the
wait-integration-pre-checks
check to only report a success once the PR is labelled with anautomerge:
label, instead of also allowingforce:integration
. This is not foolproof as cancellations may still happen if changing labels after adding theautomerge:
label, however that should be much less common an occurrence.The right solution would be remove the GH managed concurrent check and restore the one based on source tree, aka solve #6466
Security Considerations
None
Scaling Considerations
None
Documentation Considerations
Add this known limitation to the wiki
Testing Considerations
Manually on this PR
Upgrade Considerations
None