From 67b63426770b6ac5f1de96eb60e0ca14154ff112 Mon Sep 17 00:00:00 2001
From: Viktor Voytovych <vvoytovych@gmail.com>
Date: Tue, 3 Nov 2026 10:39:06 +0200
Subject: [PATCH] ci: Give the test run 25 minutes until the suite is split

On main the controller package takes 1131-1170 s of the required
check's 1200 s go test timeout, and #844 hit it while its tests passed
in the Tests workflow. CI and make test move to 25 minutes together.
The job stays under ci-basic's 30-minute cap: about 4 minutes of steps
come before the tests. #837 tracks the split that removes the need.
---
 .github/workflows/ci.yaml | 4 +++-
 Makefile                  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4eff3056..eb240c30 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,7 +13,9 @@ jobs:
     uses: datum-cloud/actions/.github/workflows/ci-basic.yaml@v1.26.0
     with:
       skip: docker,test
+      # The controller package's envtest suite outgrew 20 minutes; 25 until it is
+      # split (#837). The job must stay under ci-basic's 30-minute cap.
       run: |
         make locations-crds
         go install sigs.k8s.io/controller-runtime/tools/setup-envtest@32759fab31191897ae86091d8831b2d4b890aedd
-        KUBEBUILDER_ASSETS="$(setup-envtest use 1.31.0 -p path)" go test $(go list ./... | grep -v /e2e) -timeout 20m
+        KUBEBUILDER_ASSETS="$(setup-envtest use 1.31.0 -p path)" go test $(go list ./... | grep -v /e2e) -timeout 25m
diff --git a/Makefile b/Makefile
index a42a3a42..f2c9405f 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,10 @@ locations-crds: kustomize ## Render the locations service CRDs envtest installs.
 	mkdir -p $(LOCALBIN)/crds/locations
 	$(KUSTOMIZE) build config/tools/locations-crds -o $(LOCALBIN)/crds/locations
 
+# The test timeout matches ci.yaml's, which says why.
 .PHONY: test
 test: manifests generate fmt vet envtest locations-crds ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -timeout 20m -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -timeout 25m -coverprofile cover.out
 
 # The e2e suite runs against the two-cluster prod-fidelity env; bring it up and
 # run it with `task test-infra:up` then `task test-infra:test-e2e`