github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76039 from johnSchnake/conformanceErrExit 

Finish saving test results on failure
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-03 11:14:49 -07:00 committed by GitHub
parent 2c675818ed 4fec7c7568
commit 41691a031a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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}