From f5aaeb06401521ab7b389d64828155bee12a0e92 Mon Sep 17 00:00:00 2001 From: Alexey Zhokhov Date: Wed, 18 Nov 2026 16:58:46 +0700 Subject: [PATCH 1/2] velnor-new: batch the merge queue (HEADGREEN, 10 per merge) Co-Authored-By: Claude Sonnet 5.5 Signed-off-by: Alexey Zhokhov --- modules/repository-policy/main.tf | 13 +++++++++++++ modules/repository-policy/variables.tf | 10 ++++++++++ variables.tf | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/modules/repository-policy/main.tf b/modules/repository-policy/main.tf index 607d0c4..fe34449 100644 --- a/modules/repository-policy/main.tf +++ b/modules/repository-policy/main.tf @@ -130,6 +130,19 @@ resource "github_repository_ruleset" "protect_main" { required_review_thread_resolution = true } + dynamic "merge_queue" { + for_each = var.repository_policies[each.value].merge_queue == null ? [] : [var.repository_policies[each.value].merge_queue] + content { + grouping_strategy = merge_queue.value.grouping_strategy + max_entries_to_build = merge_queue.value.max_entries_to_build + max_entries_to_merge = merge_queue.value.max_entries_to_merge + min_entries_to_merge = merge_queue.value.min_entries_to_merge + min_entries_to_merge_wait_minutes = merge_queue.value.min_entries_to_merge_wait_minutes + check_response_timeout_minutes = merge_queue.value.check_response_timeout_minutes + merge_method = merge_queue.value.merge_method + } + } + dynamic "required_status_checks" { for_each = length(var.repository_policies[each.value].required_checks) > 0 ? [1] : [] content { diff --git a/modules/repository-policy/variables.tf b/modules/repository-policy/variables.tf index 2421864..260be3b 100644 --- a/modules/repository-policy/variables.tf +++ b/modules/repository-policy/variables.tf @@ -20,6 +20,16 @@ variable "repository_policies" { include = list(string) bypass_user_ids = list(number) })), {}) + # Merge queue on the default branch. null (the default) leaves the queue off. + merge_queue = optional(object({ + grouping_strategy = string + max_entries_to_build = number + max_entries_to_merge = number + min_entries_to_merge = number + min_entries_to_merge_wait_minutes = number + check_response_timeout_minutes = number + merge_method = string + })) })) validation { diff --git a/variables.tf b/variables.tf index c68403a..3feeeb6 100644 --- a/variables.tf +++ b/variables.tf @@ -33,6 +33,16 @@ variable "repository_policies" { include = list(string) bypass_user_ids = list(number) })), {}) + # Merge queue on the default branch. null (the default) leaves the queue off. + merge_queue = optional(object({ + grouping_strategy = string + max_entries_to_build = number + max_entries_to_merge = number + min_entries_to_merge = number + min_entries_to_merge_wait_minutes = number + check_response_timeout_minutes = number + merge_method = string + })) })) validation { @@ -276,6 +286,17 @@ variable "repository_policies" { required_checks = ["Required"] strict_required_status_checks = true protect_tags_update = true + # Batched queue (owner decision 2026-11-18): 13 runners fit about one full CI run, + # so only the newest entry of a group must pass and up to 10 PRs merge per run. + merge_queue = { + grouping_strategy = "HEADGREEN" + max_entries_to_build = 2 + max_entries_to_merge = 10 + min_entries_to_merge = 1 + min_entries_to_merge_wait_minutes = 5 + check_response_timeout_minutes = 90 + merge_method = "SQUASH" + } tag_creation_rulesets = { # Only the owner may create release tags (tailrocks/velnor-new#682). # The velnor-release GitHub App replaces this bypass later. From e339257df0444536b23adddfd9a0c75ded38dce8 Mon Sep 17 00:00:00 2001 From: Alexey Zhokhov Date: Wed, 18 Nov 2026 18:12:55 +0700 Subject: [PATCH 2/2] velnor-new: keep live ruleset (strict off, Required verdict required) Match the live main ruleset so the merge queue change is the only diff. Co-Authored-By: Claude Sonnet 5.5 Signed-off-by: Alexey Zhokhov --- variables.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/variables.tf b/variables.tf index 3feeeb6..9c4223b 100644 --- a/variables.tf +++ b/variables.tf @@ -282,10 +282,9 @@ variable "repository_policies" { required_checks = ["DCO", "Required"] } "velnor-new" = { - visibility = "public" - required_checks = ["Required"] - strict_required_status_checks = true - protect_tags_update = true + visibility = "public" + required_checks = ["Required", "Required verdict"] + protect_tags_update = true # Batched queue (owner decision 2026-11-18): 13 runners fit about one full CI run, # so only the newest entry of a group must pass and up to 10 PRs merge per run. merge_queue = {