Skip to content

Commit eb52047

Browse files
committed
Choose an older Kubetest2 commit version instead of using latest and manually set timeout to 24h.
1 parent 6f0d556 commit eb52047

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

test/k8s-integration/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,10 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
529529
kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--skip-regex=%s", skip))
530530
kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--parallel=%d", testParams.parallel))
531531
kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--test-args=%s", testConfigArg))
532+
// Default timeout has been reduced from 24 hours to 1 hours
533+
// in k/k repo because Ginkgo v1 is deprecated
534+
// since https://github.com/kubernetes/kubernetes/pull/109111.
535+
kubeTest2Args = append(kubeTest2Args, "--ginkgo-args=--timeout=24h")
532536

533537
err = runCommand("Running Tests", exec.Command("kubetest2", kubeTest2Args...))
534538
if err != nil {

test/run-k8s-integration.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ readonly parallel_run=${PARALLEL:-}
3131

3232
make -C "${PKGDIR}" test-k8s-integration
3333

34-
go install sigs.k8s.io/kubetest2@latest;
35-
go install sigs.k8s.io/kubetest2/kubetest2-gce@latest;
36-
go install sigs.k8s.io/kubetest2/kubetest2-gke@latest;
37-
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
34+
# Choose an older Kubetest2 commit version instead of using @latest
35+
# because of a regression in https://github.com/kubernetes-sigs/kubetest2/pull/183.
36+
# Contact engprod oncall and ask about what is the version they are using for internal jobs.
37+
go install sigs.k8s.io/kubetest2@0e09086b60c122e1084edd2368d3d27fe36f384f;
38+
go install sigs.k8s.io/kubetest2/kubetest2-gce@0e09086b60c122e1084edd2368d3d27fe36f384f;
39+
go install sigs.k8s.io/kubetest2/kubetest2-gke@0e09086b60c122e1084edd2368d3d27fe36f384f;
40+
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@0e09086b60c122e1084edd2368d3d27fe36f384f;
3841

3942
echo "make successful"
4043
base_cmd="${PKGDIR}/bin/k8s-integration-test \

0 commit comments

Comments
 (0)