diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index adc8bdad511fcf8fdc43500b32fc4b714cf92fe5..69a7d9fb47e4864dc726bb0d587d7ded67203bfa 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -23,9 +23,19 @@ # EXTRA_BUILD_ARGS: additional flags to pass into minikube start # JOB_NAME: the name of the logfile and check name to update on github - -# Copy only the files we need to this workspace mkdir -p out/ testdata/ + +# Install gsutil if necessary. +if ! type -P gsutil; then + if [[ ! -x "out/gsutil/gsutil" ]]; then + echo "Installing gsutil to $(pwd)/out ..." + curl -s https://storage.googleapis.com/pub/gsutil.tar.gz | tar -C out/ -zxf - + fi + export PATH="$(pwd)/out/gsutil:$PATH" +fi + +# Add the out/ directory to the PATH, for using new drivers. +export PATH="$(pwd)/out/":$PATH gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/minikube-${OS_ARCH} out/ gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/docker-machine-driver-* out/ gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/e2e-${OS_ARCH} out/ @@ -48,8 +58,6 @@ export MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete || true ./out/minikube-${OS_ARCH} delete || true -# Add the out/ directory to the PATH, for using new drivers. -export PATH="$(pwd)/out/":$PATH # Linux cleanup virsh -c qemu:///system list --all \ @@ -90,7 +98,10 @@ find ~/.minikube || true # Allow this to fail, we'll switch on the return code below. set +e -${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH} +${SUDO_PREFIX}out/e2e-${OS_ARCH} \ + -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ + -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" \ + -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH} result=$? set -e