Skip to content
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.

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

kubernetes cached make test: disable -race, simplify running #20991

Merged
merged 2 commits into from
Feb 24, 2021
Merged
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions config/jobs/kubernetes/sig-testing/make-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ presubmits:
mkdir -p _output/local/go/
time tar -xzf cache.tar.gz -C _output/local/go
# Run tests as usual
time make test KUBE_RACE=-race KUBE_TIMEOUT=--timeout=240s
time make test KUBE_TIMEOUT=--timeout=240s
# TODO: direct copy from pull-kubernetes-bazel-test, tune these
resources:
limits:
Expand Down Expand Up @@ -58,8 +58,7 @@ periodics:
- |
result=0
# Run the tests as usual
( cd hack/tools && GO111MODULE=on go install gotest.tools/gotestsum ) || result=$?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we still need this ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm just saw the commit description

/hold cancel

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

liggitt fixed this when we started migrating things to make test, it does the sane thing and installs a copy from hack/tools/go.mod's version into a local GOBIN and uses that instead of depending on one in system PATH

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(in 1.21 devel)

time make test KUBE_TIMEOUT=--timeout=600s KUBE_RACE=-race || result=$?
time make test KUBE_TIMEOUT=--timeout=600s || result=$?
# Send the cache off to gcs
time tar -czf cache.tar.gz -C _output/local/go cache/ || result=$?
time gsutil cp cache.tar.gz gs://kubernetes-jenkins/cache/poc/k8s-test-cache.tar.gz || result=$?
Expand Down Expand Up @@ -88,7 +87,4 @@ periodics:
mkdir -p _output/local/go/
time tar -xzf cache.tar.gz -C _output/local/go
# Run tests as usual
result=0
( cd hack/tools && GO111MODULE=on go install gotest.tools/gotestsum ) || result=$?
time make test KUBE_TIMEOUT=--timeout=600s KUBE_RACE=-race || result=$?
exit $result
time make test KUBE_TIMEOUT=--timeout=600s