Use delete with default profile name in tests

kubernetes · Jul 21, 2017 · 38ae8b0 · 38ae8b0
1 parent f5adecd
commit 38ae8b0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh
@@ -24,6 +24,9 @@
 # JOB_NAME: the name of the logfile and check name to update on github
 
 
+# Set default minikube profile name
+DEFAULT_MINIKUBE_PROFILE=minikube
+
 # Copy only the files we need to this workspace
 mkdir -p out/ testdata/
 gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/minikube-${OS_ARCH} out/
@@ -60,8 +63,8 @@ pgrep xhyve | xargs kill || true
 chmod +x out/e2e-${OS_ARCH}
 chmod +x out/minikube-${OS_ARCH}
 
-MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete \
-|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete \
+MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete ${DEFAULT_MINIKUBE_PROFILE}\
+|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete ${DEFAULT_MINIKUBE_PROFILE}\
 || true
 sudo rm -rf $HOME/.minikube || true
 sudo rm -rf $HOME/.kube || true
@@ -75,8 +78,8 @@ ${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-args="--vm-driver=${VM_DRIVER} --v=10
 result=$?
 set -e
 
-MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete \
-|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete \
+MINIKUBE_WANTREPORTERRORPROMPT=False sudo ./out/minikube-${OS_ARCH} delete ${DEFAULT_MINIKUBE_PROFILE}\
+|| MINIKUBE_WANTREPORTERRORPROMPT=False ./out/minikube-${OS_ARCH} delete ${DEFAULT_MINIKUBE_PROFILE}\
 || true
 sudo rm -rf $HOME/.minikube || true
 sudo rm -rf $HOME/.kube || true