Choose an older Kubetest2 commit version instead of using latest and manually set timeout to 24h.

Author: tyuchn

test/k8s-integration/main.go

@@ -529,6 +529,10 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
 	kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--skip-regex=%s", skip))
 	kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--parallel=%d", testParams.parallel))
 	kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--test-args=%s", testConfigArg))
+	// Default timeout has been reduced from 24 hours to 1 hours
+	// in k/k repo because Ginkgo v1 is deprecated
+	// since https://github.com/kubernetes/kubernetes/pull/109111.
+	kubeTest2Args = append(kubeTest2Args, "--ginkgo-args=--timeout=24h")
 
 	err = runCommand("Running Tests", exec.Command("kubetest2", kubeTest2Args...))
 	if err != nil {

test/run-k8s-integration.sh

@@ -31,10 +31,13 @@ readonly parallel_run=${PARALLEL:-}
 
 make -C "${PKGDIR}" test-k8s-integration
 
-go install sigs.k8s.io/kubetest2@latest;
-go install sigs.k8s.io/kubetest2/kubetest2-gce@latest;
-go install sigs.k8s.io/kubetest2/kubetest2-gke@latest;
-go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
+# Choose an older Kubetest2 commit version instead of using @latest 
+# because of a regression in https://github.com/kubernetes-sigs/kubetest2/pull/183.
+# Contact engprod oncall and ask about what is the version they are using for internal jobs.
+go install sigs.k8s.io/kubetest2@0e09086b60c122e1084edd2368d3d27fe36f384f;
+go install sigs.k8s.io/kubetest2/kubetest2-gce@0e09086b60c122e1084edd2368d3d27fe36f384f;
+go install sigs.k8s.io/kubetest2/kubetest2-gke@0e09086b60c122e1084edd2368d3d27fe36f384f;
+go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@0e09086b60c122e1084edd2368d3d27fe36f384f;
 
 echo "make successful"
 base_cmd="${PKGDIR}/bin/k8s-integration-test \