Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/test-e2e-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading