Skip to content

fix(rulesets): let the next Platform merge group validate early #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devantler merged 1 commit into from
Nov 11, 2026
Merged

fix(rulesets): let the next Platform merge group validate early #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions deploy/repository-rulesets/require-merge-queue-on-platform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
#
# A hosted-runner queue delayed a successful required check to 111 minutes
# (platform#3097). A bounded 120-minute response window absorbs that measured
# admission delay while preserving every required check and single-build queue.
# admission delay while preserving every required check.
# Catalogue runner demand remains a separate root-cause repair in .github#475.
#
# Build two candidates so validation can overlap. Platform's production
# preflight requires the first queue entry and an exact parent on main. Keep
# one PR per merge so the validated predecessor can become the next main tip.
#
# No Create and no Delete: the ruleset already exists, and removing this file
# must orphan it on GitHub rather than delete the production merge gate.
apiVersion: repo.github.m.upbound.io/v1alpha1
Expand Down Expand Up @@ -56,7 +60,7 @@ spec:
mergeQueue:
- checkResponseTimeoutMinutes: 120
groupingStrategy: ALLGREEN
maxEntriesToBuild: 1
maxEntriesToBuild: 2
maxEntriesToMerge: 1
mergeMethod: SQUASH
minEntriesToMerge: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/platform-merge-queue-ruleset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ assert_json "bypass actors" '[{"actorType":"OrganizationAdmin","bypassMode":"alw
assert_json "target branch" '["~DEFAULT_BRANCH"]' '.spec.forProvider.conditions[0].refName[0].include'
assert_json "excluded branches" '[]' '.spec.forProvider.conditions[0].refName[0].exclude'
assert_value "rule count" "1" '.spec.forProvider.rules | length'
assert_json "merge queue" '[{"checkResponseTimeoutMinutes":120,"groupingStrategy":"ALLGREEN","maxEntriesToBuild":1,"maxEntriesToMerge":1,"mergeMethod":"SQUASH","minEntriesToMerge":1,"minEntriesToMergeWaitMinutes":5}]' '.spec.forProvider.rules[0].mergeQueue'
assert_json "merge queue" '[{"checkResponseTimeoutMinutes":120,"groupingStrategy":"ALLGREEN","maxEntriesToBuild":2,"maxEntriesToMerge":1,"mergeMethod":"SQUASH","minEntriesToMerge":1,"minEntriesToMergeWaitMinutes":5}]' '.spec.forProvider.rules[0].mergeQueue'

# The platform#3097 probe has served its purpose and must not come back.
probe="$(yq -N 'select(.kind == "RepositoryRuleset" and .metadata.name == "platform-template-probe-bypass-roundtrip") | .metadata.name' "${render}" | grep -c . || true)"
Expand Down
Loading