From b3b3751c7579cb3ba071f9d5ce3f30a6e8e8489c Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 26 Aug 2022 17:13:08 +0200
Subject: [PATCH] e2e: increase Ginkgo timeout

Ginkgo v2 reduced the default timeout to 1 hour, which is too low for us.
---
 Jenkinsfile    | 1 +
 test/test.make | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index d24c51d07..f0f71af6a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -587,6 +587,7 @@ void TestInVM(worker, coverage, distro, distroVersion, kubernetesVersion, skipIf
                            testrun=\$(echo '${distro}-${distroVersion}-${coverage}${kubernetesVersion}' | sed -e s/--*/-/g | tr . _ ) && \
                            make test_e2e TEST_E2E_REPORT_DIR=${WORKSPACE}/build/reports.tmp/\$testrun \
                                          TEST_E2E_SKIP=${skipAlways}@\$(if [ \"${env.CHANGE_ID}\" ] && [ \"${env.CHANGE_ID}\" != null ]; then echo \\\\[Slow\\\\]@${skipIfPR}; fi) \
+                                         TEST_E2E_TIMEOUT=${TestTimeoutHours()-1}h \
                            ') 2>&1 | tee joblog-${BUILD_TAG}-test-${coverage}${kubernetesVersion}.log | grep --line-buffered -E -e 'checking for test|Passed|FAIL:|^ERROR' \
            "
     } } finally {
diff --git a/test/test.make b/test/test.make
index ae094c7cc..b97db2166 100644
--- a/test/test.make
+++ b/test/test.make
@@ -140,6 +140,9 @@ foobar:
 # i.e. usually just junit_01.xml.
 TEST_E2E_REPORT_DIR=
 
+# The value for the -ginkgo.timeout parameter.
+TEST_E2E_TIMEOUT=5h
+
 # Additional e2e.test arguments, like -ginkgo.failFast.
 TEST_E2E_ARGS =
 
@@ -177,6 +180,7 @@ RUN_E2E = KUBECONFIG=`pwd`/_work/$(CLUSTER)/kube.config \
                 -ginkgo.skip='$(subst $(space),|,$(strip $(subst @,$(space),$(TEST_E2E_SKIP_ALL))))' \
                 -ginkgo.focus='$(subst $(space),|,$(strip $(subst @,$(space),$(TEST_E2E_FOCUS))))' \
 		-ginkgo.randomizeAllSpecs=false \
+		-ginkgo.timeout=$(TEST_E2E_TIMEOUT) \
 	        $(TEST_E2E_ARGS) \
                 -report-dir=$(TEST_E2E_REPORT_DIR)
 test_e2e: start $(RUN_TEST_DEPS) operator-generate-bundle