Merge pull request #18238 from ihmccreery/run-is-up

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-09 12:53:33 -08:00
commit 5839086618
1 changed files with 2 additions and 0 deletions

View File

@ -1268,6 +1268,8 @@ fi
# Jenkins will look at the junit*.xml files for test failures, so don't exit
# with a nonzero error code if it was only tests that failed.
if [[ "${E2E_TEST,,}" == "true" ]]; then
# Check to make sure the cluster is up before running tests, and fail if it's not.
go run ./hack/e2e.go ${E2E_OPT} -v --isup
go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="${GINKGO_TEST_ARGS}" && exitcode=0 || exitcode=$?
if [[ "${E2E_PUBLISH_GREEN_VERSION:-}" == "true" && ${exitcode} == 0 && -n ${githash:-} ]]; then
echo "publish githash to ci/latest-green.txt: ${githash}"