From 0b456e40bfb3f3a0ae3996ceeaf348636db00c3a Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Thu, 5 Feb 2015 09:13:56 -0800
Subject: [PATCH] Fix jenkins/hack/e2e.sh, log errors better

---
 cluster/kube-up.sh  |  2 ++
 hack/jenkins/e2e.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh
index 37d59d9f59d..6972ad80a70 100755
--- a/cluster/kube-up.sh
+++ b/cluster/kube-up.sh
@@ -46,3 +46,5 @@ echo "... calling setup-logging-firewall" >&2
 setup-logging-firewall
 
 echo "Done" >&2
+
+exit 0
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 9b363e221f7..1a0dde2b939 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -78,8 +78,8 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
 fi
 
 export KUBE_CONFIG_FILE="config-test.sh"
-cluster/kube-down.sh
-cluster/kube-up.sh
-cluster/kubectl.sh version
-hack/ginkgo-e2e.sh --report_dir=${WORKSPACE}
-cluster/kube-down.sh
+cluster/kube-down.sh || true
+cluster/kube-up.sh || { echo "-- kube-up failed --"; exit 1; }
+cluster/kubectl.sh version || { echo "-- kubectl failed --"; exit 1; }
+hack/ginkgo-e2e.sh --report_dir=${WORKSPACE} || { echo "-- tests failed --"; exit 1; }
+cluster/kube-down.sh || { echo "-- kube-down failed --"; exit 1; }