Repository navigation
NO-ISSUE: Let ci-duty force-merge on osac and enhancement-proposals - #269
Merged
Merged
Conversation
GitHub shows "Merge without waiting for requirements to be met" only to someone who can bypass every rule on the branch. ci-duty bypassed the ci-status-checks ruleset on osac and osac-test-infra, but: - osac's branch protection also requires one approval and a code owner review, which only admins could skip. Add a pull_request_bypassers input to the module and give it to ci-duty on osac. - enhancement-proposals had only managers as a ruleset bypass actor. Add ci-duty. osac-test-infra needs no change: its only rule is the ruleset ci-duty already bypasses. Also remove ItzikEzra-rh from ci-duty. Assisted-by: Claude Code (Claude Opus 5.5) <noreply@anthropic.com> Signed-off-by: Elior Erez <eerez@redhat.com>
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.
Summary
Since #268,
ci-dutymembers don't see GitHub's "Merge without waiting for requirements to be met (bypass rules)" checkbox on osac. GitHub shows it only to someone who can bypass every rule on the branch:osacrequired_approvals = 1,require_code_owner_reviews = true). Only admins could skip it; before #268 the force-merge group were admins throughwg-infra.pull_request_bypassers, set toosac-project/ci-dutyon osac.osac-test-infraci-status-checksruleset, whichci-dutyalready bypasses.enhancement-proposalsci-dutywasn't a bypass actor on itsci-status-checksruleset.ci-dutytoruleset_bypass_team_ids.Also removes
ItzikEzra-rhfromci-duty.Changes
modules/common_repository: newpull_request_bypassersvariable (default[]), passed torequired_pull_request_reviews.pull_request_bypassers. No effect on repos that don't set it.repositories.tf: on osac,pull_request_bypassers = ["osac-project/ci-duty"]; on enhancement-proposals,ci-dutyis added to the ruleset bypass list.team-members/ci-duty.csv:ItzikEzra-rhis removed. They keep push on all repos throughwg-qe.teams.csv(ci-duty description) andREADME.md: describe the force-merge scope.Validation
tofu fmt -check -recursive,tofu validate,pre-commit run --all-files: pass.module.repo_osac.github_branch_protection.repo_protection[0]andmodule.repo_enhancement_proposals.github_repository_ruleset.status_checks[0], theci-dutydescription, and the 2 recurring repo updates; 1 destroy (ItzikEzra-rh's ci-duty membership). I'll post the local plan output once it's run.ci-dutymember who isn't an org owner sees the bypass checkbox on an osac PR and on an enhancement-proposals PR.🤖 Generated with Claude Code
Summary
ci-dutyas a ruleset bypass team onenhancement-proposals. Onosac, adds the team as a pull-request review bypasser as well as a ruleset bypass actor. The README documents that the bypass can skip merge-queue, status-check, and—onosac—required-review rules.pull_request_bypassersinput tomodules/common_repository. It defaults to an empty list, so callers that do not set it retain the existing behavior.ItzikEzra-rhfrom theci-dutymember list. The supplied objective states that they retain push access throughwg-qe.ci-dutyteam description. No database, controller, or deployment changes are shown. No test changes are included. The author reports thattofu fmt -check -recursive,tofu validate, andpre-commit run --all-filespass; these results were not independently verified.Compatibility
The new module input is backward-compatible for existing callers because it defaults to
[]. The repository rules change expandsci-dutymembers’ ability to bypass merge requirements. Removing a member changes that person’sci-dutyaccess.Risk classification
Unavailable. The supplied evidence does not include the labeling instructions, an applied risk label, or the criteria for
risk:ship,risk:show, andrisk:ask. The evidence also does not support determining whether the change was close to another classification.