Skip to content

Commit 3582dce

Browse files
authored
Merge pull request kubernetes#127626 from thockin/stop_disabling_GO111MODULE_in_tests
Stop setting GO111MODULE=off in tests
2 parents 9f42d51 + 061c4f4 commit 3582dce

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

hack/jenkins/benchmark-dockerized.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ export KUBE_ROOT
4242

4343
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
4444

45-
# Until all GOPATH references are removed from all build scripts as well,
46-
# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
47-
# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
48-
export GO111MODULE=off
49-
5045
# Install tools we need
51-
GO111MODULE=on go -C "${KUBE_ROOT}/hack/tools" install github.com/cespare/prettybench
52-
GO111MODULE=on go -C "${KUBE_ROOT}/hack/tools" install gotest.tools/gotestsum
46+
go -C "${KUBE_ROOT}/hack/tools" install github.com/cespare/prettybench
47+
go -C "${KUBE_ROOT}/hack/tools" install gotest.tools/gotestsum
5348

5449
# Disable the Go race detector.
5550
export KUBE_RACE=" "

hack/jenkins/test-dockerized.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,8 @@ set -o xtrace
2626

2727
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
2828

29-
# Until all GOPATH references are removed from all build scripts as well,
30-
# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
31-
# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
32-
export GO111MODULE=off
33-
3429
# Install tools we need
35-
GO111MODULE=on go -C "./hack/tools" install gotest.tools/gotestsum
30+
go -C "./hack/tools" install gotest.tools/gotestsum
3631

3732
# Disable coverage report
3833
export KUBE_COVER="n"

0 commit comments

Comments
 (0)