github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

opt out of module mode for builds

Browse Source
This commit is contained in:
Jordan Liggitt 2019-06-12 13:52:50 -04:00
parent 9d708b0203
commit 8618c09369
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/jenkins/benchmark-dockerized.sh
View File

@ -38,6 +38,11 @@ retry() {
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
# Until all GOPATH references are removed from all build scripts as well,
# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
export GO111MODULE=off
go install k8s.io/kubernetes/vendor/github.com/cespare/prettybench go install k8s.io/kubernetes/vendor/github.com/cespare/prettybench
go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum

5
hack/jenkins/test-dockerized.sh
View File

@ -37,6 +37,11 @@ retry() {
export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
# Until all GOPATH references are removed from all build scripts as well,
# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
export GO111MODULE=off
go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum
# Enable the Go race detector. # Enable the Go race detector.

4
hack/lib/init.sh
View File

@ -23,10 +23,10 @@ set -o pipefail
unset CDPATH unset CDPATH
# Until all GOPATH references are removed from all build scripts as well, # Until all GOPATH references are removed from all build scripts as well,
# explicitly reset to auto mode to avoid picking up user-set GO111MODULE preferences. # explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
# As individual scripts (like hack/update-vendor.sh) make use of go modules, # As individual scripts (like hack/update-vendor.sh) make use of go modules,
# they can explicitly set GO111MODULE=on # they can explicitly set GO111MODULE=on
export GO111MODULE=auto export GO111MODULE=off
# The root of the build/dist directory # The root of the build/dist directory
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"

2
hack/make-rules/test.sh
View File

@ -250,7 +250,7 @@ produceJUnitXMLReport() {
if ! command -v gotestsum >/dev/null 2>&1; then if ! command -v gotestsum >/dev/null 2>&1; then
kube::log::error "gotestsum not found; please install with " \ kube::log::error "gotestsum not found; please install with " \
"go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum" "GO111MODULE=off go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum"
return return
fi fi
gotestsum --junitfile "${junit_xml_filename}" --raw-command cat "${junit_filename_prefix}"*.stdout gotestsum --junitfile "${junit_xml_filename}" --raw-command cat "${junit_filename_prefix}"*.stdout

5
test/e2e_node/jenkins/e2e-node-jenkins.sh
View File

@ -28,6 +28,11 @@ set -x
. "${1}" . "${1}"
# Until all GOPATH references are removed from all build scripts as well,
# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
export GO111MODULE=off
# indirectly generates test/e2e/generated/bindata.go too # indirectly generates test/e2e/generated/bindata.go too
make generated_files make generated_files