Skip to content

Commit

Permalink
hack/jenkins: Delete VM before manual cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
r2d4 committed Aug 25, 2017
1 parent 737bc4e commit 812fd4f
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions hack/jenkins/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/busybox.yaml testda
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/pvc.yaml testdata/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/busybox-mount-test.yaml testdata/

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

Expand Down Expand Up @@ -70,13 +74,11 @@ if [ -e out/docker-machine-driver-hyperkit ]; then
sudo chmod u+s out/docker-machine-driver-hyperkit || true
fi

MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete \
|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete \
|| true

# See the default image
./out/minikube-${OS_ARCH} start -h | grep iso

tree ~/.minikube || true

# Allow this to fail, we'll switch on the return code below.
set +e
${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-args="--vm-driver=${VM_DRIVER} --v=10 --logtostderr" -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH}
Expand Down

0 comments on commit 812fd4f

Please sign in to comment.