Merge pull request kubernetes#902 from jbeda/e2efix

Fix e2e teardown
mattf · Aug 14, 2014 · f521fff · f521fff
2 parents ad8e853 + 629f964
commit f521fff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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