From e58aff001b7cd20de09aa54fa600a3dbec35ed5c Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Fri, 2 Oct 2015 10:32:44 +0200
Subject: [PATCH] Stop existing Kubemark cluster before creating new one in
 Jenkins

---
 hack/jenkins/e2e.sh            | 1 +
 test/kubemark/stop-kubemark.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 1bf3dac1ec1..d6716f46968 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -814,6 +814,7 @@ fi
 ### Start Kubemark ###
 if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
   export RUN_FROM_DISTRO=true
+  ./test/kubemark/stop-kubemark.sh
   ./test/kubemark/start-kubemark.sh
   ./test/kubemark/run-scalability-test.sh && exitcode=0 || exitcode=$?
   if [[ "${E2E_PUBLISH_GREEN_VERSION:-}" == "true" && ${exitcode} == 0 && -n ${githash:-} ]]; then
diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh
index 82a8f7b6698..c0201b1bd6e 100755
--- a/test/kubemark/stop-kubemark.sh
+++ b/test/kubemark/stop-kubemark.sh
@@ -36,4 +36,4 @@ gcloud compute disks delete \
       --project "${PROJECT}" \
       --quiet \
       --zone "${ZONE}" \
-      "${MASTER_NAME}"-pd
+      "${MASTER_NAME}"-pd || true