mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #84166 from johnSchnake/conformanceNoEarlyExit
Ensure script saves results even when tests fail
This commit is contained in:
commit
6237c00652
@ -40,8 +40,8 @@ saveResults() {
|
|||||||
# Entry provided via env var to simplify invocation.
|
# Entry provided via env var to simplify invocation.
|
||||||
if [[ -n ${E2E_USE_GO_RUNNER:-} ]]; then
|
if [[ -n ${E2E_USE_GO_RUNNER:-} ]]; then
|
||||||
set -x
|
set -x
|
||||||
/gorunner
|
/gorunner && ret=0 || ret=$?
|
||||||
exit $?
|
exit ${ret}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We get the TERM from kubernetes and handle it gracefully
|
# We get the TERM from kubernetes and handle it gracefully
|
||||||
@ -67,8 +67,7 @@ ginkgo_args+=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
set -x
|
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)
|
/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=$?
|
||||||
ret=$?
|
|
||||||
set +x
|
set +x
|
||||||
saveResults
|
saveResults
|
||||||
exit ${ret}
|
exit ${ret}
|
||||||
|
Loading…
Reference in New Issue
Block a user