diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 785f6c9e69f5..48e12afa78ab 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -89,9 +89,13 @@ export CLUSTER_NAME=${E2E_CLUSTER_NAME} export ZONE=${E2E_ZONE} export KUBE_GKE_NETWORK=${E2E_NETWORK} -export PATH=${PATH}:/usr/local/go/bin +: ${GOPATH:="${WORKSPACE}/gopath"} +export GOPATH + +export PATH=${GOPATH}/bin:${PATH}:/usr/local/go/bin export KUBE_SKIP_CONFIRMATIONS=y + if [[ ${KUBE_RUN_FROM_OUTPUT:-} =~ ^[yY]$ ]]; then echo "Found KUBE_RUN_FROM_OUTPUT=y; will use binaries from _output" cp _output/release-tars/kubernetes*.tar.gz . @@ -141,6 +145,9 @@ fi # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml export E2E_REPORT_DIR=${WORKSPACE} +# Install godep (needed to build the Ginkgo runner) +go get github.com/tools/godep + ### Set up ### go run ./hack/e2e.go ${E2E_OPT} -v --down go run ./hack/e2e.go ${E2E_OPT} -v --up