Unpatch Jenkins now that #4177 is fixed

And actually, make it more better: Go ahead and tear down the cluster
even when tests fail, but (hopefully) relay the test exit status
correctly. This fails if there's a double error (if -down *also*
fails, we'll fail due to errexit), but either way is a build failure,
and this means that the teardown of a test failure build isn't getting
charged to the next run.
This commit is contained in:
Zach Loafman 2015-02-11 13:26:10 -08:00
parent 55e8357c0f
commit a08e04dd68

View File

@ -83,5 +83,7 @@ export E2E_REPORT_DIR=${WORKSPACE}
go run ./hack/e2e.go ${E2E_OPT} -v --down
go run ./hack/e2e.go ${E2E_OPT} -v --up
go run ./hack/e2e.go -v --ctl="version --match-server-version=false"
go run ./hack/e2e.go ${E2E_OPT} -v --test || echo "Ignored, Jenkins will pass/fail based on test failures"
status=0
go run ./hack/e2e.go ${E2E_OPT} -v --test || status=$?
go run ./hack/e2e.go ${E2E_OPT} -v --down
exit $status