From 629f964791fad860d7132d8200d0c7168e4d97d7 Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Thu, 14 Aug 2014 13:57:50 -0700
Subject: [PATCH] Fix e2e teardown

---
 cluster/gce/util.sh | 2 +-
 hack/e2e-test.sh    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 0c4372237f3..669cf634075 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -357,7 +357,7 @@ function test-teardown {
     --project ${PROJECT} \
     --norespect_terminal_width \
     --force \
-    ${MINION_TAG}-http-alt
+    ${MINION_TAG}-http-alt || true > /dev/null
   $(dirname $0)/../cluster/kube-down.sh > /dev/null
 }
 
diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
index f590b9a2962..c85d5627c32 100755
--- a/hack/e2e-test.sh
+++ b/hack/e2e-test.sh
@@ -43,6 +43,7 @@ export KUBE_REPO_ROOT="$(dirname $0)/.."
 export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
 
 if [[ $TEAR_DOWN -ne 0 ]]; then
+  detect-project
   trap test-teardown EXIT
   exit 0
 fi