From 46a17f60e4d1f8aab461db2f9df604a41b330612 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 4 Feb 2025 15:57:30 +0100 Subject: [PATCH] E2E node: fix --timeout default For unknown reasons, hack/make-rules/test-e2e-node.sh adds -timeout instead of --timeout. Therefore the fallback code in test/e2e_node/remote/remote.go didn't find it and added its own --timeout=60m after it. This effectively limits E2E node test runs to 60 minutes, regardless of what is specified in the job: W0206 09:53:51.425532 7151 remote.go:158] ginkgo flags are missing explicit --timeout (ginkgo defaults to 60 minutes) I0206 09:53:51.425565 7151 remote.go:165] updated ginkgo flags: -timeout=24h --label-filter="Feature: containsAny DynamicResourceAllocation && Feature: isSubsetOf { Beta, DynamicResourceAllocation } && !Flaky && !Slow" --no-color -v --timeout=60m ... I0206 09:53:57.767096 7151 ssh.go:146] Running the command ssh, with args: ... timeout -k 30s 3600.000000s ./ginkgo -timeout=24h --label-filter="Feature: containsAny DynamicResourceAllocation && Feature: isSubsetOf { Beta, DynamicResourceAllocation } && !Flaky && !Slow" --no-color -v --timeout=60m ... Note that the timeout for the test was 60m in this case (hence the "timeout -k 30s 3600.000000s") but it could also be something larger. --- test/e2e_node/remote/remote.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go index b08669195c3..fef2cd80626 100644 --- a/test/e2e_node/remote/remote.go +++ b/test/e2e_node/remote/remote.go @@ -154,7 +154,7 @@ func RunRemote(cfg RunRemoteConfig) (string, bool, error) { } allGinkgoFlags := cfg.GinkgoArgs - if !strings.Contains(allGinkgoFlags, "--timeout") { + if !strings.Contains(allGinkgoFlags, "-timeout") { klog.Warningf("ginkgo flags are missing explicit --timeout (ginkgo defaults to 60 minutes)") // see https://github.com/onsi/ginkgo/blob/master/docs/index.md#:~:text=ginkgo%20%2D%2Dtimeout%3Dduration // ginkgo suite timeout should be more than the default but less than the