github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Ensure script saves results even when tests fail

Browse Source 
When we run commands that may exit non-zero during normal operation
we need to ensure the script does not exit early and avoid
saving the results.

Signed-off-by: John Schnake <jschnake@vmware.com>
This commit is contained in:
John Schnake 2019-10-21 15:15:23 -05:00
parent b717be8269
commit 9a3a051d1c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/images/conformance/run_e2e.sh
View File

@ -40,8 +40,8 @@ saveResults() {
# Entry provided via env var to simplify invocation.
if [[ -n ${E2E_USE_GO_RUNNER:-} ]]; then
set -x
/gorunner
exit $?
/gorunner && ret=0 || ret=$?
exit ${ret}
fi
# We get the TERM from kubernetes and handle it gracefully
@ -67,8 +67,7 @@ ginkgo_args+=(
)
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}" -v="${E2E_VERBOSITY}" > >(tee "${RESULTS_DIR}"/e2e.log)
ret=$?
/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}" -v="${E2E_VERBOSITY}" > >(tee "${RESULTS_DIR}"/e2e.log) && ret=0 || ret=$?
set +x
saveResults
exit ${ret}