Repository navigation
ci: merge_group trigger, cancel-superseded and end-of-queue cache janitor (GEN-022) - #1336
Merged
Merged
Conversation
…itor (GEN-022) Steps 1-2 of GEN-022's merge-queue transition (forge-ci/ci.yml#432). Refs forge-ci/ci.yml#432
Local-Gate: v1 tree=25a701708cf5c5b952e1aff946697fc94b0349e8 secs=598 lanes=linux-quick:run
Ci-Attestation: {"at":1793017745,"gate":"rust/all/fmt","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"a0ae5d0aab5259dfaca9f7928cb63218","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"python/all/static","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"bd7104278a721b4d22899434da52be46","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"rust/x86_64-unknown-linux-gnu/check","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"1de6a6ed97a4c7684b0096f0d4c98c59","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"rust/x86_64-unknown-linux-gnu/dylint","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"d92f61661498f164215a47c88eaa1578","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"rust/x86_64-unknown-linux-gnu/test","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"c84834a1e570bfbcebd08a125f38adad","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"python/linux-x64/test","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"1d3b7f92b7bf7b42cb00786db554a0eb","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
Ci-Attestation: {"at":1793017745,"gate":"general/linux-x64/perf","host":"linux-x86_64","key":"374668cbe847a1e407bf7482c78a204b63afc89dbbc70c210c38ae9ea2f897ce","lane":"linux-quick","parents":["bd905ec713f399922d900795d7b24e6cfd31b461"],"secs":598,"stamp":"89e9e65deafc1606a78be05c1a20010d","tree":"25a701708cf5c5b952e1aff946697fc94b0349e8","v":1,"via":"run"}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Steps 1-2 of GEN-022's merge-queue transition (forge-ci/ci.yml#432). Same shape as forge-ci/zccache#1998 and forge-ci/soldr#3923.
ci.ymltriggers onmerge_group(types: checks_requested). On a queue run,ci-moderunslocal-gate verify, which passes non-PR events straight through, solinux-quick(Linux x64 checks) always runs. The schedule- and label-gated lanes stay skipped.cancel-superseded(fix(broker): bound pre-bind serve steps to unblock macOS rejected-handoff e2e #409): runs only on merge_group, noneeds:. It runsci/cancel_superseded.py, copied from ci: merge_group trigger, cancel-superseded and end-of-queue cache janitor (GEN-022) forge-ci/zccache#1998.queue-cache-janitor: runsci-lint cache janitorafter every other job onalways(), only on merge_group, and holds the non-cancellingcache-janitorgroup.[cache].budget = "9GB"is declared. It checks out ci-lint at current forge-ci/ci.yml main (953c4e1) rather than thelinterpin (86b6393), because the pin predates the repo-wide budget LRU pass (feat(cache): merge queue policy; end-of-queue janitor enforces [cache].budget by LRU (#405) forge-ci/ci.yml#407). That adds one CT-004 finding. The nightlycache-budgetjob is unchanged.merge_groupwas already allowed for ci.yml.[allow].permissionsgrantsactions: writeto cancel-superseded and queue-cache-janitor.cancel-supersededis verify-exempt (GATE-002).needs:on cancel-superseded, the janitor needing every other job, the group, and that nothing else depends on cancel-superseded. The existing cache-budget pins in tests/test_cache_budget.py still hold.ci-lint plan, so the linter pin is unchanged (step 1 does not apply).ci-lint precheck --local(forge-ci/ci.yml main): GEN-022 is cleared. The only new finding is the CT-004 above (and a line-number shift on an existing SEC-001). The local gate passed (linux-quick, 598s) and the head is stamped. The first gate run caught a bug in the new test (it matchedneeds:in a comment), fixed in the second commit. Nextest's one-retry flakeobserver_launched_tree_test::an_observed_configured_command_spawns_verbatim_and_reports_lifecyclewas seen on the first run and is not related.Not included: the queue ruleset (step 3). Suggested required checks:
CI mode,Linux x64 checks / lint gates (linux-x86)(that aggregate requirespreflightanddylint).Refs forge-ci/ci.yml#432