Skip to content

K
k3s
Commit c6bb01d2 authored by John Schnake's avatar John Schnake
Browse files
Options

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
parent a9f35a67
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
cluster/images/conformance/run_e2e.sh
View file @ c6bb01d2
...@@ -62,5 +62,6 @@ set -x ...@@ -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 & /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 set +x
# $! is the pid of tee, not ginkgo # $! is the pid of tee, not ginkgo
wait "$(pgrep ginkgo)" wait "$(pgrep ginkgo)" && ret=0 || ret=$?
saveResults saveResults
exit ${ret}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment