Skip to content

Commit 5c6ca8a

Browse files
templates: Use 'pipefail' so that grep doesn't mask install failures
Installer was failing, the grep caused setup to be "successful", and the test container then immediately failed.
1 parent 1bef1f4 commit 5c6ca8a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ objects:
385385
- -c
386386
- |
387387
#!/bin/sh
388-
set -e
388+
set -euo pipefail
389389
390390
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
391391
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ objects:
244244
- -c
245245
- |
246246
#!/bin/sh
247-
set -e
247+
set -euo pipefail
248248
249249
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
250250
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ objects:
340340
- -c
341341
- |
342342
#!/bin/sh
343-
set -e
343+
set -euo pipefail
344344
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
345345
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
346346

0 commit comments

Comments
 (0)