From 9f49650fba756e73d7ffdc91ae545e499c35aeac Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Thu, 14 Aug 2014 09:48:46 -0700
Subject: [PATCH] Add a tear down option to the e2e, that just tears down the
 cluster Useful for cleaning state after failed runs.

---
 cluster/gce/util.sh | 5 +++--
 hack/e2e-test.sh    | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 161d5277e22..0c4372237f3 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -357,7 +357,8 @@ function test-teardown {
     --project ${PROJECT} \
     --norespect_terminal_width \
     --force \
-    ${MINION_TAG}-http-alt &
-  $(dirname $0)/../cluster/kube-down.sh > /dev/null &
+    ${MINION_TAG}-http-alt
+  $(dirname $0)/../cluster/kube-down.sh > /dev/null
 }
 
+
diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
index d61a81c7560..f590b9a2962 100755
--- a/hack/e2e-test.sh
+++ b/hack/e2e-test.sh
@@ -24,6 +24,7 @@ source $(dirname $0)/../cluster/$KUBERNETES_PROVIDER/util.sh
 # cluster running.
 ALREADY_UP=${1:-0}
 LEAVE_UP=${2:-0}
+TEAR_DOWN=${3:-0}
 
 HAVE_JQ=$(which jq)
 if [[ -z ${HAVE_JQ} ]]; then
@@ -41,6 +42,11 @@ export KUBE_CONFIG_FILE="config-test.sh"
 export KUBE_REPO_ROOT="$(dirname $0)/.."
 export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
 
+if [[ $TEAR_DOWN -ne 0 ]]; then
+  trap test-teardown EXIT
+  exit 0
+fi
+
 # Build a release required by the test provider [if any]
 test-build-release