mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #80796 from erikwilson/master
e2e: Run ginkgo in foreground, elminiate wait & pgrep
This commit is contained in:
commit
c5787856b9
@ -67,9 +67,8 @@ 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=$?
|
||||||
set +x
|
set +x
|
||||||
# $! is the pid of tee, not ginkgo
|
|
||||||
wait "$(pgrep ginkgo)" && ret=0 || ret=$?
|
|
||||||
saveResults
|
saveResults
|
||||||
exit ${ret}
|
exit ${ret}
|
||||||
|
Loading…
Reference in New Issue
Block a user