Skip to content

velnor-new: batch the merge queue (HEADGREEN, 10 per merge) - #62

Merged
donbeave merged 2 commits into
mainfrom
velnor-new-merge-queue-batching
Nov 18, 2026
Merged

donbeave merged 2 commits into
mainfrom
velnor-new-merge-queue-batching

Conversation

@donbeave

Copy link
Copy Markdown
Contributor

Why

velnor-new has 13 CI runners, which work through about one full CI run (~39 jobs) at a time, and 36 approved PRs are waiting. With ALLGREEN and 5 builds, every queue entry needs its own full run, so the queue is limited by runner capacity. Owner decision 2026-11-18: batch the queue.

What

protect-main (ruleset 24396608) on velnor-new only:

setting before after
grouping_strategy ALLGREEN HEADGREEN
max_entries_to_build 5 2
max_entries_to_merge 5 10
min_entries_to_merge 1 1
min_entries_to_merge_wait_minutes 0 5
check_response_timeout_minutes 90 90
merge_method SQUASH SQUASH

HEADGREEN needs only the newest entry of a group to pass, and its build already contains every PR ahead of it, so one CI run validates the whole group.

Implementation

The repo did not manage merge_queue at all. This adds an optional merge_queue field (default null, which adds no rule) to repository_policies and a dynamic merge_queue rule in the module. Only velnor-new sets it, so no other repository changes.

Verification

tofu fmt -check -recursive and tofu validate pass. No plan or apply was run.

🤖 Generated with Claude Code

donbeave and others added 2 commits November 18, 2026 16:58
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: Alexey Zhokhov <alexey@zhokhov.com>
Match the live main ruleset so the merge queue change is the only diff.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: Alexey Zhokhov <alexey@zhokhov.com>
@donbeave
donbeave marked this pull request as ready for review November 18, 2026 12:12
@donbeave
donbeave merged commit 63fd209 into main Nov 18, 2026
11 checks passed
@donbeave
donbeave deleted the velnor-new-merge-queue-batching branch November 18, 2026 12:54
donbeave added a commit that referenced this pull request Nov 18, 2026
Keep #62's velnor-new merge_queue block and the existing required checks.
Strict stays at its default (false). This branch only adds DCO and
rust-required to velnor-new required_checks.

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
Signed-off-by: Alexey Zhokhov <alexey@zhokhov.com>
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.

1 participant