github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80796 from erikwilson/master

Browse Source 
e2e: Run ginkgo in foreground, elminiate wait & pgrep
This commit is contained in:
Kubernetes Prow Robot 2019-07-31 20:09:03 -07:00 committed by GitHub
commit c5787856b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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