Skip to content

Commit 812fd4f

Browse files
committed
hack/jenkins: Delete VM before manual cleanup
1 parent 737bc4e commit 812fd4f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

hack/jenkins/common.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/busybox.yaml testda
3333
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/pvc.yaml testdata/
3434
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/busybox-mount-test.yaml testdata/
3535

36+
export MINIKUBE_WANTREPORTERRORPROMPT=False
37+
sudo ./out/minikube-${OS_ARCH} delete || true
38+
./out/minikube-${OS_ARCH} delete || true
39+
3640
# Add the out/ directory to the PATH, for using new drivers.
3741
export PATH="$(pwd)/out/":$PATH
3842

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

73-
MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete \
74-
|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete \
75-
|| true
76-
7777
# See the default image
7878
./out/minikube-${OS_ARCH} start -h | grep iso
7979

80+
tree ~/.minikube || true
81+
8082
# Allow this to fail, we'll switch on the return code below.
8183
set +e
8284
${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}

0 commit comments

Comments
 (0)