From c6bb01d2a1e7195eab72c1374a962fa3999f0f3e Mon Sep 17 00:00:00 2001
From: John Schnake <jschnake@vmware.com>
Date: Tue, 2 Apr 2019 11:39:40 -0500
Subject: [PATCH] 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
---
 cluster/images/conformance/run_e2e.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/images/conformance/run_e2e.sh b/cluster/images/conformance/run_e2e.sh
index 35d6253afd..5264a89126 100755
--- 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}