Skip to content

Commit

Permalink
ci-operator/step-registry/openshift/e2e/test: Background and wait for…
Browse files Browse the repository at this point in the history
… openshift-tests

The end-to-end step originated without the background/wait pattern in
a2fd8c3 (step-registry: add Origin E2E test step, 2020-01-31, openshift#6965).
But as described in 4472ace
(ci-operator/templates/openshift/installer: Restore backgrounded
'create cluster', 2019-01-23, openshift#2680), we want the background-and-wait
pattern to make openshift-tests a child process that will receive
TERMs via this step's existing 'trap' handler.  openshift-tests can
take hours, and when the step gets a TERM, we want to quickly pass
that through to the slow children, so they exit, so the step can exit,
so we have plenty of time for asset uploading and subsequent gather
and teardown steps.  That gives us the resources we need to figure out
why the test was abnormally slow.
  • Loading branch information
wking committed Mar 21, 2021
1 parent 5429a79 commit aaa4979
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ function upgrade() {
--options "${TEST_UPGRADE_OPTIONS-}" \
--provider "${TEST_PROVIDER}" \
-o "${ARTIFACT_DIR}/e2e.log" \
--junit-dir "${ARTIFACT_DIR}/junit"
--junit-dir "${ARTIFACT_DIR}/junit" &
wait "$!"
set +x
}

Expand All @@ -142,7 +143,8 @@ function suite() {
openshift-tests run "${TEST_SUITE}" ${TEST_ARGS:-} \
--provider "${TEST_PROVIDER}" \
-o "${ARTIFACT_DIR}/e2e.log" \
--junit-dir "${ARTIFACT_DIR}/junit"
--junit-dir "${ARTIFACT_DIR}/junit" &
wait "$!"
set +x
}

Expand Down

0 comments on commit aaa4979

Please sign in to comment.