Skip to content

Commit d0744e5

Browse files
author
Oleg Bulatov
committed
exit with 0 even if kill failed
1 parent 9f9555e commit d0744e5

24 files changed

+58
-58
lines changed

‎ci-operator/templates/master-sidecar-3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ objects:
6666
set -euo pipefail
6767
6868
trap 'touch /tmp/shared/exit' EXIT
69-
trap 'jobs -p | xargs -r kill; exit 0' TERM
69+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
7070
7171
# wait until the master job creates admin.kubeconfig
7272
while true; do
@@ -104,7 +104,7 @@ objects:
104104
echo "Gathering artifacts ..."
105105
}
106106
trap 'teardown' EXIT
107-
trap 'jobs -p | xargs -r kill; exit 0' TERM
107+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
108108
109109
(
110110
while true; do

‎ci-operator/templates/master-sidecar-4.2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ objects:
122122
set -euo pipefail
123123
124124
trap 'touch /tmp/shared/exit' EXIT
125-
trap 'jobs -p | xargs -r kill; exit 0' TERM
125+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
126126
127127
# wait until the master job creates admin.kubeconfig
128128
while true; do
@@ -175,7 +175,7 @@ objects:
175175
cp -R /tmp/shared/logs /tmp/artifacts/
176176
}
177177
trap 'teardown' EXIT
178-
trap 'jobs -p | xargs kill || true; wait; exit 0' TERM
178+
trap 'jobs -p | xargs -r kill || true; wait; exit 0' TERM
179179
180180
export HOME=/tmp/home
181181
export PATH=/tmp/shared/bin:$PATH

‎ci-operator/templates/master-sidecar-4.3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ objects:
122122
set -euo pipefail
123123
124124
trap 'touch /tmp/shared/exit' EXIT
125-
trap 'jobs -p | xargs -r kill; exit 0' TERM
125+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
126126
127127
# wait until the master job creates admin.kubeconfig
128128
while true; do
@@ -175,7 +175,7 @@ objects:
175175
cp -R /tmp/shared/logs /tmp/artifacts/
176176
}
177177
trap 'teardown' EXIT
178-
trap 'jobs -p | xargs kill || true; wait; exit 0' TERM
178+
trap 'jobs -p | xargs -r kill || true; wait; exit 0' TERM
179179
180180
export HOME=/tmp/home
181181
export PATH=/tmp/shared/bin:$PATH

‎ci-operator/templates/master-sidecar-4.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ objects:
122122
set -euo pipefail
123123
124124
trap 'touch /tmp/shared/exit' EXIT
125-
trap 'jobs -p | xargs -r kill; exit 0' TERM
125+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
126126
127127
# wait until the master job creates admin.kubeconfig
128128
while true; do
@@ -175,7 +175,7 @@ objects:
175175
cp -R /tmp/shared/logs /tmp/artifacts/
176176
}
177177
trap 'teardown' EXIT
178-
trap 'jobs -p | xargs kill || true; wait; exit 0' TERM
178+
trap 'jobs -p | xargs -r kill || true; wait; exit 0' TERM
179179
180180
export HOME=/tmp/home
181181
export PATH=/tmp/shared/bin:$PATH

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ objects:
321321
322322
}
323323
324-
trap 'jobs -p | xargs -r kill; exit 0' TERM
324+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
325325
teardown
326326
327327
# Runs an install

‎ci-operator/templates/openshift/endurance/endurance-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ objects:
110110
export PATH=/usr/libexec/origin:$PATH
111111
112112
trap 'touch /tmp/done' EXIT
113-
trap 'jobs -p | xargs -r kill; exit 0' TERM
113+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
114114
115115
mkdir -p "${HOME}"
116116

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ objects:
168168
export PATH=/tmp/shared:$PATH
169169
170170
trap 'touch /tmp/shared/exit' EXIT
171-
trap 'jobs -p | xargs -r kill; exit 0' TERM
171+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
172172
173173
function patch_image_specs() {
174174
cat <<EOF >samples-patch.yaml
@@ -789,7 +789,7 @@ objects:
789789
}
790790
791791
trap 'teardown' EXIT
792-
trap 'jobs -p | xargs -r kill; exit 0' TERM
792+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
793793
794794
for i in $(seq 1 220); do
795795
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ objects:
154154
export PATH=/usr/libexec/origin:$PATH
155155
156156
trap 'touch /tmp/shared/exit' EXIT
157-
trap 'jobs -p | xargs -r kill; exit 0' TERM
157+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
158158
159159
function fips_check() {
160160
oc --insecure-skip-tls-verify --request-timeout=60s get nodes -o jsonpath --template '{range .items[*]}{.metadata.name}{"\n"}{end}' > /tmp/nodelist
@@ -875,7 +875,7 @@ objects:
875875
}
876876
877877
trap 'teardown' EXIT
878-
trap 'jobs -p | xargs -r kill; exit 0' TERM
878+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
879879
880880
for i in $(seq 1 220); do
881881
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ objects:
127127
#!/bin/bash
128128
set -euo pipefail
129129
trap 'touch "${HOME}"/exit' EXIT
130-
trap 'jobs -p | xargs -r kill; exit 0' TERM
130+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
131131
mock-nss.sh
132132
gcloud auth activate-service-account \
133133
--quiet --key-file /tmp/cluster/gce.json
@@ -326,7 +326,7 @@ objects:
326326
}
327327
328328
trap 'teardown' EXIT
329-
trap 'jobs -p | xargs -r kill; exit 0' TERM
329+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
330330
331331
for i in `seq 1 180`; do
332332
if [[ -f /home/packer/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ objects:
124124
export PATH=/usr/libexec/origin:$PATH
125125
126126
trap 'touch /tmp/shared/exit' EXIT
127-
trap 'jobs -p | xargs -r kill; exit 0' TERM
127+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
128128
129129
mkdir -p "${HOME}"
130130
@@ -628,7 +628,7 @@ objects:
628628
}
629629
630630
trap 'teardown' EXIT
631-
trap 'jobs -p | xargs -r kill; exit 0' TERM
631+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
632632
633633
for i in $(seq 1 220); do
634634
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ objects:
131131
export PATH=/tmp/shared:/usr/libexec/origin:$PATH
132132
133133
trap 'touch /tmp/shared/exit' EXIT
134-
trap 'jobs -p | xargs -r kill; exit 0' TERM
134+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
135135
136136
mkdir -p "${HOME}"
137137
@@ -581,7 +581,7 @@ objects:
581581
export CLUSTER_NAME=${CLUSTER_NAME: -14}
582582
583583
trap 'teardown' EXIT
584-
trap 'jobs -p | xargs -r kill; exit 0' TERM
584+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
585585
586586
for i in $(seq 1 220); do
587587
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ objects:
119119
export PATH=/tmp/shared:$PATH
120120
121121
trap 'touch /tmp/shared/exit' EXIT
122-
trap 'jobs -p | xargs -r kill; exit 0' TERM
122+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
123123
124124
mkdir -p "${HOME}"
125125
@@ -695,7 +695,7 @@ objects:
695695
}
696696
697697
trap 'teardown' EXIT
698-
trap 'jobs -p | xargs -r kill; exit 0' TERM
698+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
699699
700700
for i in `seq 1 180`; do
701701
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ objects:
199199
export PATH=/usr/libexec/origin:$PATH
200200
201201
trap 'touch /tmp/shared/exit' EXIT
202-
trap 'jobs -p | xargs -r kill; exit 0' TERM
202+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
203203
204204
mkdir -p "${HOME}"
205205
@@ -2035,7 +2035,7 @@ objects:
20352035
}
20362036
20372037
trap 'teardown' EXIT
2038-
trap 'jobs -p | xargs -r kill; exit 0' TERM
2038+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
20392039
20402040
for i in $(seq 1 220); do
20412041
if [[ -f /tmp/shared/exit ]]; then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ objects:
208208
export PATH=/tmp/shared:$PATH
209209
210210
trap 'touch /tmp/shared/exit' EXIT
211-
trap 'jobs -p | xargs -r kill; exit 0' TERM
211+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
212212
213213
mkdir -p "${HOME}"
214214
@@ -1235,7 +1235,7 @@ objects:
12351235
}
12361236
12371237
trap 'teardown' EXIT
1238-
trap 'jobs -p | xargs -r kill; exit 0' TERM
1238+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
12391239
12401240
for i in $(seq 1 220); do
12411241
if [[ -f /tmp/shared/exit ]]; then

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-ansible.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ objects:
9696
export PATH=/usr/libexec/origin:$PATH
9797
9898
trap 'touch /tmp/shared/exit' EXIT
99-
trap 'jobs -p | xargs -r kill; exit 0' TERM
99+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
100100
101101
cp "$(which oc)" /tmp/shared/
102102
@@ -195,7 +195,7 @@ objects:
195195
set -euo pipefail
196196
197197
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/shared/exit; fi; exit $rc' EXIT
198-
trap 'jobs -p | xargs -r kill; exit 0' TERM
198+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
199199
200200
cd /usr/share/ansible/openshift-ansible/
201201
mkdir -p test/ci/inventory/group_vars/OSEv3
@@ -314,7 +314,7 @@ objects:
314314
}
315315
316316
trap 'teardown' EXIT
317-
trap 'jobs -p | xargs -r kill; exit 0' TERM
317+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
318318
319319
for i in `seq 1 180`; do
320320
if [[ -f /tmp/shared/exit ]]; then

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-jenkins.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ objects:
9797
set -euo pipefail
9898
9999
trap 'touch /tmp/shared/prepared' EXIT
100-
trap 'jobs -p | xargs -r kill; exit 0' TERM
100+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
101101
102102
cp "$(which oc)" /tmp/shared/
103103
@@ -181,7 +181,7 @@ objects:
181181
export PATH=/usr/libexec/origin:$PATH
182182
183183
trap 'touch /tmp/shared/exit' EXIT
184-
trap 'jobs -p | xargs -r kill; exit 0' TERM
184+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
185185
186186
cp "$(which oc)" /tmp/shared/
187187
@@ -286,7 +286,7 @@ objects:
286286
set -euo pipefail
287287
288288
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/exit; fi; exit $rc' EXIT
289-
trap 'jobs -p | xargs -r kill; exit 0' TERM
289+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
290290
291291
ansible-playbook -vv \
292292
-e openshift_test_repo=${RPM_REPO_OPENSHIFT_ORIGIN} -e 'oreg_url=${IMAGE_FORMAT}' \
@@ -363,7 +363,7 @@ objects:
363363
}
364364
365365
trap 'teardown' EXIT
366-
trap 'jobs -p | xargs -r kill; exit 0' TERM
366+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
367367
368368
for i in `seq 1 180`; do
369369
if [[ -f /tmp/shared/exit ]]; then

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ objects:
100100
export PATH=/usr/libexec/origin:$PATH
101101
102102
trap 'touch /tmp/shared/exit' EXIT
103-
trap 'jobs -p | xargs -r kill; exit 0' TERM
103+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
104104
105105
cp "$(which oc)" /tmp/shared/
106106
@@ -190,7 +190,7 @@ objects:
190190
set -euo pipefail
191191
192192
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/shared/exit; else touch /tmp/shared/install; fi; exit $rc' EXIT
193-
trap 'jobs -p | xargs -r kill; exit 0' TERM
193+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
194194
195195
ansible-playbook -vv \
196196
-e openshift_test_repo="${PREVIOUS_RPM_REPO}" \
@@ -223,7 +223,7 @@ objects:
223223
set -euo pipefail
224224
225225
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/shared/exit; else touch /tmp/shared/test; fi; exit $rc' EXIT
226-
trap 'jobs -p | xargs -r kill; exit 0' TERM
226+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
227227
228228
while true; do
229229
if [[ ! -f /tmp/shared/install ]]; then
@@ -311,7 +311,7 @@ objects:
311311
}
312312
313313
trap 'teardown' EXIT
314-
trap 'jobs -p | xargs -r kill; exit 0' TERM
314+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
315315
316316
for i in `seq 1 180`; do
317317
if [[ -f /tmp/shared/exit ]]; then

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ objects:
9898
export PATH=/usr/libexec/origin:$PATH
9999
100100
trap 'touch /tmp/shared/exit' EXIT
101-
trap 'jobs -p | xargs -r kill; exit 0' TERM
101+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
102102
103103
cp "$(which oc)" /tmp/shared/
104104
@@ -189,7 +189,7 @@ objects:
189189
set -euo pipefail
190190
191191
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/exit; fi; exit $rc' EXIT
192-
trap 'jobs -p | xargs -r kill; exit 0' TERM
192+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
193193
194194
ansible-playbook -vv \
195195
-e openshift_test_repo=${RPM_REPO_OPENSHIFT_ORIGIN} -e 'oreg_url=${IMAGE_FORMAT}' \
@@ -267,7 +267,7 @@ objects:
267267
}
268268
269269
trap 'teardown' EXIT
270-
trap 'jobs -p | xargs -r kill; exit 0' TERM
270+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
271271
272272
for i in `seq 1 180`; do
273273
if [[ -f /tmp/shared/exit ]]; then

‎ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ objects:
111111
export PATH=/tmp/shared:$PATH
112112
113113
trap 'touch /tmp/shared/exit' EXIT
114-
trap 'jobs -p | xargs -r kill; exit 0' TERM
114+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
115115
116116
mkdir -p "${HOME}"
117117
@@ -172,7 +172,7 @@ objects:
172172
set -euo pipefail
173173
174174
trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/exit; fi; exit $rc' EXIT
175-
trap 'jobs -p | xargs -r kill; exit 0' TERM
175+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
176176
177177
ansible-playbook -vv \
178178
-e openshift_test_repo=${RPM_REPO_OPENSHIFT_ORIGIN} -e 'oreg_url=${IMAGE_FORMAT}' \
@@ -250,7 +250,7 @@ objects:
250250
}
251251
252252
trap 'teardown' EXIT
253-
trap 'jobs -p | xargs -r kill; exit 0' TERM
253+
trap 'jobs -p | xargs -r kill || true; exit 0' TERM
254254
255255
for i in `seq 1 180`; do
256256
if [[ -f /tmp/shared/exit ]]; then

0 commit comments

Comments
 (0)