feat(ci): introduce merge queue#2024
Open
elezar wants to merge 1 commit into
Open
Conversation
Closes #1946 Signed-off-by: Evan Lezar <elezar@nvidia.com>
elezar
requested review from
a team,
derekwaynecarr and
maxamillion
as code owners
elezar
commented
Jun 26, 2026
Comment on lines
+58
to
+61
| *) | ||
| echo "::error::Unsupported event '$EVENT_NAME'" >&2 | ||
| exit 1 | ||
| ;; |
Member
Author
There was a problem hiding this comment.
Question: Why not just default to the values for workflow_dispatch (which is what this code was doing beforehand).
elezar
commented
Jun 26, 2026
Comment on lines
+49
to
+51
| run_core_e2e=true | ||
| run_gpu_e2e=true | ||
| run_kubernetes_ha_e2e=false |
Member
Author
There was a problem hiding this comment.
I think we should rather not run e2e tests in the merge queue -- or use the same logic as we do for PRs?
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
1 participant
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
Add merge-queue support for the required OpenShell CI gates. The existing copy-pr-bot PR mirror flow remains intact, and merge-group runs publish the same stable
OpenShell / ...status contexts for the queued integration SHA.Related Issue
Closes #1946
Changes
.github/workflows/branch-checks.yml: addmerge_groupas a required branch-check trigger..github/workflows/branch-e2e.yml: addmerge_groupand make push, manual, and queue E2E selection explicit..github/workflows/helm-lint.yml: addmerge_groupvalidation for queued integration commits..github/workflows/required-ci-gates.yml: publish required CI statuses for merge-group SHAs without requiring apull-request/<N>mirror branch..github/actions/pr-gate/action.yml: document that non-push events includemerge_group.CI.mdandarchitecture/build.md: document the maintainer merge-queue workflow and required contexts.Deviations from Plan
None — implemented as planned. The branch was rebased after #2022 merged so local validation includes that main Rust test fix.
Testing
mise run markdown:lintgit diff --check origin/main...HEADmise run pre-commitpasses locally (attempted after rebasing on fix(server): update driver spec test argument #2022; Rust check/lint, Python, Helm, Markdown, license, docs, and packaging checks passed, buttest:ruststill fails on this machine becausexcrun --show-sdk-pathcannot find the macOS SDK and the CLI integration test temporaryfake-forward-processcannot link-lSystem)Tests added:
e2e/files changed.Checklist
Documentation updated:
CI.md: merge queue behavior, required contexts, maintainer workflow, and workflow file roles.architecture/build.md: CI architecture now includes merge-group validation.