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
k3s-v1.15.3
John Schnake 2019-04-02 11:39:40 -05:00
parent 46c8b075de
commit 4fec7c7568
1 changed files with 2 additions and 1 deletions

View File

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