Skip to content

Commit f01fdf5

Browse files
committed
fix(ci): stop running e2e in merge queues
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 12cec59 commit f01fdf5

3 files changed

Lines changed: 12 additions & 19 deletions

File tree

‎.github/workflows/branch-e2e.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: Branch E2E Checks
22

33
on:
4-
merge_group:
5-
types: [checks_requested]
64
push:
75
branches:
86
- "pull-request/[0-9]+"
@@ -50,15 +48,6 @@ jobs:
5048
run_kubernetes_ha_e2e="$(jq -r 'index("test:e2e-kubernetes") != null' <<< "$LABELS_JSON")"
5149
run_kubernetes_credential_drivers_e2e="$(jq -r 'index("test:e2e-kubernetes") != null' <<< "$LABELS_JSON")"
5250
;;
53-
merge_group)
54-
# Merge groups have no PR labels. When GPU E2E is required as documented
55-
# in CI.md, skipping it leaves the gate pending until the queue times out
56-
# and ejects the PR. HA stays off until stable.
57-
run_core_e2e=true
58-
run_gpu_e2e=true
59-
run_kubernetes_ha_e2e=false
60-
run_kubernetes_credential_drivers_e2e=false
61-
;;
6251
*)
6352
run_core_e2e=true
6453
run_gpu_e2e=true

‎.github/workflows/required-ci-gates.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@ jobs:
276276
resolve_context
277277
278278
evaluate_workflow "OpenShell / Branch Checks" "branch-checks.yml" "Branch Checks"
279-
evaluate_workflow "OpenShell / E2E" "branch-e2e.yml" "Branch E2E Checks" "test:e2e" "Core E2E result"
280-
evaluate_workflow "OpenShell / GPU E2E" "branch-e2e.yml" "Branch E2E Checks" "test:e2e-gpu" "GPU E2E result"
279+
# E2E is opt-in on PRs and does not run for merge groups.
280+
if [ "$CONTEXT_KIND" != "merge_group" ]; then
281+
evaluate_workflow "OpenShell / E2E" "branch-e2e.yml" "Branch E2E Checks" "test:e2e" "Core E2E result"
282+
evaluate_workflow "OpenShell / GPU E2E" "branch-e2e.yml" "Branch E2E Checks" "test:e2e-gpu" "GPU E2E result"
283+
fi
281284
evaluate_workflow "OpenShell / Helm Lint" "helm-lint.yml" "Helm Lint"

‎CI.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,6 @@ Important: if a PR requires manual admission, every new commit needs another `/o
433433
GitHub merge queue is required for `main`. Repository administrators must enable **Require merge queue** in the branch ruleset for `main` and keep these required status contexts aligned with the PR gates:
434434

435435
- `OpenShell / Branch Checks`
436-
- `OpenShell / E2E`
437-
- `OpenShell / GPU E2E`
438436
- `OpenShell / Helm Lint`
439437
- `OpenShell / Trivy Changes`
440438

@@ -445,7 +443,7 @@ its own stable result status.
445443
Merge-group runs use the `merge_group` event. The event is distinct from `pull_request` and `push`, and GitHub will not report required checks for queued PRs unless the workflows include it. In this repository:
446444

447445
- `Branch Checks` runs the standard non-E2E gates on the merge-group SHA.
448-
- `Branch E2E Checks` runs core E2E and GPU E2E for merge groups. Kubernetes HA E2E remains optional and label-driven on PRs.
446+
- `Branch E2E Checks` does not run for merge groups. E2E suites remain opt-in on PRs.
449447
- `Helm Lint` runs for merge groups without the PR diff optimization, because the merge-group branch is the final integration state.
450448
- `Trivy Changes` compares the merge-group configuration with its base and rejects new High or Critical findings.
451449
- `Required CI Gates` posts the same `OpenShell / ...` statuses to the merge-group SHA and does not require a `pull-request/<N>` mirror for merge-group events.
@@ -471,7 +469,7 @@ The bot's full administrator documentation is internal to NVIDIA. The only comma
471469
| File | Role |
472470
|---|---|
473471
| `.github/workflows/branch-checks.yml` | Required non-E2E checks. Triggers on `push: pull-request/[0-9]+` for PR mirrors and `merge_group` for queued merges. |
474-
| `.github/workflows/branch-e2e.yml` | Standard, GPU, Kubernetes HA, and Kubernetes credential-driver E2E. PR mirror pushes use `test:e2e`, `test:e2e-gpu`, and `test:e2e-kubernetes` labels; merge groups run core and GPU E2E. |
472+
| `.github/workflows/branch-e2e.yml` | Standard, GPU, Kubernetes HA, and Kubernetes credential-driver E2E. PR mirror pushes use `test:e2e`, `test:e2e-gpu`, and `test:e2e-kubernetes` labels; merge groups do not run E2E. |
475473
| `.github/workflows/build-binaries.yml`, `build-vm-driver.yml` | Shared binary matrices used by branch and release workflows. The VM driver remains separate because its build consumes the runtime binaries. |
476474
| `.github/workflows/build-images.yml` | Builds and pushes multi-platform images, then uploads the same OCI images as workflow artifacts. |
477475
| `.github/workflows/package-release-binaries.yml` | Packages raw build artifacts into release tarballs without rebuilding them. |
@@ -507,11 +505,14 @@ These workflows run after merge to publish dev/tagged artifacts and verify them.
507505
Require these statuses in the branch ruleset for PR and merge-queue CI:
508506

509507
- `OpenShell / Branch Checks`
510-
- `OpenShell / E2E`
511-
- `OpenShell / GPU E2E`
512508
- `OpenShell / Helm Lint`
513509
- `OpenShell / Trivy Changes`
514510

511+
The following statuses are opt-in and controlled by labels:
512+
513+
- `OpenShell / E2E`: `test:e2e`
514+
- `OpenShell / GPU E2E`: `test:e2e-gpu`
515+
515516
For mirror-based workflows, require the statuses published by
516517
`Required CI Gates`, not their underlying jobs. `OpenShell / Trivy Changes` is
517518
the stable result job of the direct pull-request workflow. Together these

0 commit comments

Comments
 (0)