Skip to content

Commit c7a5f4c

Browse files
Merge pull request #6718 from smarterclayton/exit_code
templates: Use 'pipefail' so that grep doesn't mask install failures
2 parents 9c6e556 + 5c6ca8a commit c7a5f4c

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
@@ -386,7 +386,7 @@ objects:
386386
- -c
387387
- |
388388
#!/bin/sh
389-
set -e
389+
set -euo pipefail
390390
391391
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
392392
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)