Skip to content

K
k3s
Unverified Commit 71e429a8 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76101 from johnSchnake/automated-cherry-pick-of-#76039-upstream-release-1.14

Automated cherry pick of #76039: Finish saving test results on failure
parents e8627368 c6bb01d2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
cluster/images/conformance/run_e2e.sh
View file @ 71e429a8
...@@ -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