Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit b3b3751

Browse files
committed
e2e: increase Ginkgo timeout
Ginkgo v2 reduced the default timeout to 1 hour, which is too low for us.
1 parent 72af349 commit b3b3751

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@ void TestInVM(worker, coverage, distro, distroVersion, kubernetesVersion, skipIf
587587
testrun=\$(echo '${distro}-${distroVersion}-${coverage}${kubernetesVersion}' | sed -e s/--*/-/g | tr . _ ) && \
588588
make test_e2e TEST_E2E_REPORT_DIR=${WORKSPACE}/build/reports.tmp/\$testrun \
589589
TEST_E2E_SKIP=${skipAlways}@\$(if [ \"${env.CHANGE_ID}\" ] && [ \"${env.CHANGE_ID}\" != null ]; then echo \\\\[Slow\\\\]@${skipIfPR}; fi) \
590+
TEST_E2E_TIMEOUT=${TestTimeoutHours()-1}h \
590591
') 2>&1 | tee joblog-${BUILD_TAG}-test-${coverage}${kubernetesVersion}.log | grep --line-buffered -E -e 'checking for test|Passed|FAIL:|^ERROR' \
591592
"
592593
} } finally {

test/test.make

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ foobar:
140140
# i.e. usually just junit_01.xml.
141141
TEST_E2E_REPORT_DIR=
142142

143+
# The value for the -ginkgo.timeout parameter.
144+
TEST_E2E_TIMEOUT=5h
145+
143146
# Additional e2e.test arguments, like -ginkgo.failFast.
144147
TEST_E2E_ARGS =
145148

@@ -177,6 +180,7 @@ RUN_E2E = KUBECONFIG=`pwd`/_work/$(CLUSTER)/kube.config \
177180
-ginkgo.skip='$(subst $(space),|,$(strip $(subst @,$(space),$(TEST_E2E_SKIP_ALL))))' \
178181
-ginkgo.focus='$(subst $(space),|,$(strip $(subst @,$(space),$(TEST_E2E_FOCUS))))' \
179182
-ginkgo.randomizeAllSpecs=false \
183+
-ginkgo.timeout=$(TEST_E2E_TIMEOUT) \
180184
$(TEST_E2E_ARGS) \
181185
-report-dir=$(TEST_E2E_REPORT_DIR)
182186
test_e2e: start $(RUN_TEST_DEPS) operator-generate-bundle

0 commit comments

Comments
 (0)