Skip to content

Commit 28277dd

Browse files
committed
Add comment for commit version and ginkgo timeout.
1 parent 728d9cd commit 28277dd

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

test/k8s-integration/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,9 @@ 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.
532535
kubeTest2Args = append(kubeTest2Args, "--ginkgo-args=--timeout=24h")
533536

534537
err = runCommand("Running Tests", exec.Command("kubetest2", kubeTest2Args...))

test/run-k8s-integration.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ readonly parallel_run=${PARALLEL:-}
3131

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

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.
3436
go install sigs.k8s.io/kubetest2@0e09086b60c122e1084edd2368d3d27fe36f384f;
3537
go install sigs.k8s.io/kubetest2/kubetest2-gce@0e09086b60c122e1084edd2368d3d27fe36f384f;
3638
go install sigs.k8s.io/kubetest2/kubetest2-gke@0e09086b60c122e1084edd2368d3d27fe36f384f;

0 commit comments

Comments
 (0)