From 92d28fd185fc6a201f7187660603cbb3d4835bcb Mon Sep 17 00:00:00 2001 From: Maksim Ryzhukhin Date: Tue, 13 Oct 2026 15:31:01 +0200 Subject: [PATCH] ci(e2e): give the per-model nightly legs a 60 minute test budget --- .github/workflows/test-e2e-nightly.yml | 5 ++++- Makefile | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-e2e-nightly.yml b/.github/workflows/test-e2e-nightly.yml index f93406b..a480b1a 100644 --- a/.github/workflows/test-e2e-nightly.yml +++ b/.github/workflows/test-e2e-nightly.yml @@ -20,7 +20,9 @@ jobs: test-e2e: name: kind (kustomize, CPU, ${{ matrix.model }}) runs-on: ubuntu-latest - timeout-minutes: 45 + # The full non-laya suite takes ~40-44 min on a runner; give go test 60m and + # the job room for setup and teardown. + timeout-minutes: 75 strategy: fail-fast: false matrix: @@ -67,6 +69,7 @@ jobs: # against non-laya models. fault-matrix is laya-specific (gap 1 pulls # laya:multilingual) and runs in its own job below. E2E_LABEL_FILTER: "!ha && !ha-switch && !chaos && !recreate && !scheduler && !fleet && !scheduler-edge && !registry-outage && !fault-matrix" + E2E_GO_TIMEOUT: 60m run: make test-e2e # Fault-matrix container (fault_matrix_test.go): a spec.model change during an diff --git a/Makefile b/Makefile index 6c1844a..7d78172 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,8 @@ KIND_CLUSTER ?= dmo # default) runs every spec. The per-PR workflow sets '!nightly' to skip the # heavier specs labelled "nightly" (which the nightly workflow runs in full). E2E_LABEL_FILTER ?= +# E2E_GO_TIMEOUT is the go test -timeout for the e2e run. +E2E_GO_TIMEOUT ?= 40m ifneq ($(strip $(E2E_LABEL_FILTER)),) GINKGO_LABEL_FILTER := -ginkgo.label-filter="$(E2E_LABEL_FILTER)" endif @@ -147,7 +149,7 @@ kind-down: ## Delete the kind cluster '$(KIND_CLUSTER)' (idempotent). .PHONY: test-e2e test-e2e: kind-up manifests generate fmt vet ## Run the e2e tests on kind. Leaves the cluster DOWN unless E2E_KEEP_CLUSTER=1. - KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v $(GINKGO_LABEL_FILTER) -timeout 40m; \ + KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v $(GINKGO_LABEL_FILTER) -timeout $(E2E_GO_TIMEOUT); \ status=$$?; \ if [ -z "$(E2E_KEEP_CLUSTER)" ]; then $(MAKE) kind-down; fi; \ exit $$status