Finish saving test results on failure

The conformance image should be saving its results regardless of the results of the tests. However, with errexit set, when ginkgo gets test failures it exits 1 which prevents saving the results for Sonobuoy to pick up. Fixes: #76036

Finish saving test results on failure
4fec7c75 · John Schnake · 46c8b075 · 4fec7c75
Commit 4fec7c75 authored Apr 02, 2019 by John Schnake
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

run_e2e.sh cluster/images/conformance/run_e2e.sh +2 -1

No files found.
--- a/cluster/images/conformance/run_e2e.sh
+++ b/cluster/images/conformance/run_e2e.sh
@@ -62,5 +62,6 @@ set -x
 /usr/local/bin/ginkgo "${ginkgo_args[@]}" /usr/local/bin/e2e.test -- --disable-log-dump --repo-root=/kubernetes --provider="${E2E_PROVIDER}" --report-dir="${RESULTS_DIR}" --kubeconfig="${KUBECONFIG}" | tee "${RESULTS_DIR}"/e2e.log &
 set +x
 # $! is the pid of tee, not ginkgo
-wait "$(pgrep ginkgo)"
+wait "$(pgrep ginkgo)" && ret=0 || ret=$?
 saveResults
+exit ${ret}