Fix jenkins/hack/e2e.sh, log errors better

This commit is contained in:
Zach Loafman 2015-02-05 09:13:56 -08:00
parent 827dcbc623
commit 0b456e40bf
2 changed files with 7 additions and 5 deletions

View File

@ -46,3 +46,5 @@ echo "... calling setup-logging-firewall" >&2
setup-logging-firewall
echo "Done" >&2
exit 0

View File

@ -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; }