From 0d65d310fec67b76c29a235708f8d8a7768f8dbb Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 18 Mar 2016 11:19:00 -0700 Subject: [PATCH 1/2] Enter /go/src/k8s.io/kubernetes before building/running tests Also print godep version after installing it. --- hack/jenkins/test-dockerized.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh index 218850dc089..6d0105f65a3 100755 --- a/hack/jenkins/test-dockerized.sh +++ b/hack/jenkins/test-dockerized.sh @@ -26,7 +26,7 @@ set -o xtrace export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} -go get github.com/tools/godep +go get github.com/tools/godep && godep version go get github.com/jstemmer/go-junit-report # godep v59+ has issues with our GOPATH munging, so pin to v58 for now. @@ -50,6 +50,8 @@ export KUBE_TIMEOUT='-timeout 300s' export KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 export LOG_LEVEL=4 +cd /go/src/k8s.io/kubernetes + ./hack/build-go.sh godep go install ./... ./hack/install-etcd.sh From 2d9671cf2718f51920e51647b41a658bad6b3149 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 18 Mar 2016 14:51:32 -0700 Subject: [PATCH 2/2] Revert "Pin to godep v58 in Jenkins unit/integration" This reverts commit 70813d6bb54f1bf1e8795132b188875cd4ffc8be. --- hack/jenkins/test-dockerized.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh index 6d0105f65a3..4a172afca98 100755 --- a/hack/jenkins/test-dockerized.sh +++ b/hack/jenkins/test-dockerized.sh @@ -29,15 +29,6 @@ export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH} go get github.com/tools/godep && godep version go get github.com/jstemmer/go-junit-report -# godep v59+ has issues with our GOPATH munging, so pin to v58 for now. -# https://github.com/kubernetes/kubernetes/issues/23200 -( - cd ${GOPATH}/src/github.com/tools/godep - git checkout v58 - godep go install -) -godep version - # Enable the Go race detector. export KUBE_RACE=-race # Disable coverage report