github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84166 from johnSchnake/conformanceNoEarlyExit

Browse Source 
Ensure script saves results even when tests fail
This commit is contained in:
Kubernetes Prow Robot
2019-10-24 22:55:53 -07:00
committed by GitHub
parent aebc8eae9d 9a3a051d1c
commit 6237c00652
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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