Skip to content

Commit aaa4979

Browse files
committed
ci-operator/step-registry/openshift/e2e/test: Background and wait for 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.
1 parent 5429a79 commit aaa4979

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh

100644100755
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ function upgrade() {
125125
--options "${TEST_UPGRADE_OPTIONS-}" \
126126
--provider "${TEST_PROVIDER}" \
127127
-o "${ARTIFACT_DIR}/e2e.log" \
128-
--junit-dir "${ARTIFACT_DIR}/junit"
128+
--junit-dir "${ARTIFACT_DIR}/junit" &
129+
wait "$!"
129130
set +x
130131
}
131132

@@ -142,7 +143,8 @@ function suite() {
142143
openshift-tests run "${TEST_SUITE}" ${TEST_ARGS:-} \
143144
--provider "${TEST_PROVIDER}" \
144145
-o "${ARTIFACT_DIR}/e2e.log" \
145-
--junit-dir "${ARTIFACT_DIR}/junit"
146+
--junit-dir "${ARTIFACT_DIR}/junit" &
147+
wait "$!"
146148
set +x
147149
}
148150

0 commit comments

Comments
 (0)