Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/k8s-integration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 7 additions & 4 deletions test/run-k8s-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down