Skip to content

Commit 07bd61d

Browse files
authored
Revert "add -eou pipefail to remaining job templates"
1 parent 5228952 commit 07bd61d

17 files changed

+17
-55
lines changed

ci-operator/templates/openshift/endurance/endurance-install.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ objects:
8080
- /bin/bash
8181
- -c
8282
- |
83-
#!/bin/bash
84-
set -euo pipefail
83+
#!/bin/bash -x
8584
8685
# fetch the oc binary so we can talk to the cluster.
8786
export PATH=$PATH:/tmp/shared/bin
@@ -154,8 +153,7 @@ objects:
154153
- /bin/bash
155154
- -c
156155
- |
157-
#!/bin/bash
158-
set -euo pipefail
156+
#!/bin/bash -x
159157
160158
export PATH=$PATH:/tmp/shared/bin
161159
@@ -379,8 +377,7 @@ objects:
379377
- /bin/sh
380378
- -c
381379
- |
382-
#!/bin/bash
383-
set -euo pipefail
380+
#!/bin/sh -x
384381
385382
export PATH=$PATH:/tmp/shared/bin
386383

ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ objects:
380380
- /bin/bash
381381
- -c
382382
- |
383-
#!/bin/bash
384-
set -euo pipefail
383+
#!/bin/sh
384+
set -e
385385
386386
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
387387
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
@@ -660,8 +660,6 @@ objects:
660660
- -c
661661
- |
662662
#!/bin/bash
663-
set -euo pipefail
664-
665663
function queue() {
666664
local TARGET="${1}"
667665
shift

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ objects:
385385
- /bin/bash
386386
- -c
387387
- |
388-
#!/bin/bash
388+
#!/bin/sh
389389
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
@@ -731,8 +731,6 @@ objects:
731731
- -c
732732
- |
733733
#!/bin/bash
734-
set -euo pipefail
735-
736734
function queue() {
737735
local TARGET="${1}"
738736
shift

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,8 @@ objects:
185185
- /bin/sh
186186
- -c
187187
- |
188-
#!/bin/bash
188+
#!/bin/sh
189189
set -euo pipefail
190-
191190
trap 'rc=$?; if test "${rc}" -eq 0; then touch "${HOME}"/setup-success; else touch "${HOME}"/exit; fi; exit "${rc}"' EXIT
192191
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
193192
cat > "${HOME}"/run-tests.sh << 'EOF'

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,8 @@ objects:
226226
- /bin/sh
227227
- -c
228228
- |
229-
#!/bin/bash
230-
set -euo pipefail
231-
set -x
232-
229+
#!/bin/sh
230+
set -ex
233231
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
234232
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
235233
@@ -517,8 +515,6 @@ objects:
517515
- -c
518516
- |
519517
#!/bin/bash
520-
set -euo pipefail
521-
522518
function queue() {
523519
local TARGET="${1}"
524520
shift

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,6 @@ objects:
445445
- -c
446446
- |
447447
#!/bin/bash
448-
set -euo pipefail
449-
450448
function queue() {
451449
local TARGET="${1}"
452450
shift

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,7 @@ objects:
323323
- /bin/sh
324324
- -c
325325
- |
326-
#!/bin/bash
327-
set -euo pipefail
328-
326+
#!/bin/sh
329327
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
330328
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
331329
# Wait untill lease is acquired
@@ -451,8 +449,6 @@ objects:
451449
- -c
452450
- |
453451
#!/bin/bash
454-
set -euo pipefail
455-
456452
function queue() {
457453
local TARGET="${1}"
458454
shift

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ objects:
243243
- /bin/bash
244244
- -c
245245
- |
246-
#!/bin/bash
246+
#!/bin/sh
247247
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
@@ -566,8 +566,6 @@ objects:
566566
- -c
567567
- |
568568
#!/bin/bash
569-
set -euo pipefail
570-
571569
function queue() {
572570
local TARGET="${1}"
573571
shift

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,8 @@ objects:
338338
- /bin/sh
339339
- -c
340340
- |
341-
#!/bin/bash
341+
#!/bin/sh
342342
set -euo pipefail
343-
344343
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
345344
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
346345
@@ -1856,7 +1855,6 @@ objects:
18561855
- -c
18571856
- |
18581857
#!/bin/bash
1859-
set -euo pipefail
18601858
18611859
function queue() {
18621860
local TARGET="${1}"

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,8 @@ objects:
333333
- /bin/sh
334334
- -c
335335
- |
336-
#!/bin/bash
337-
set -euo pipefail
338-
336+
#!/bin/sh
337+
set -e
339338
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
340339
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
341340
@@ -1074,7 +1073,6 @@ objects:
10741073
- -c
10751074
- |
10761075
#!/bin/bash
1077-
set -euo pipefail
10781076
10791077
function queue() {
10801078
local TARGET="${1}"

0 commit comments

Comments
 (0)