Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "add -eou pipefail to remaining job templates" #6748

Merged
merged 1 commit into from
Jan 17, 2020
Merged

Revert "add -eou pipefail to remaining job templates" #6748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ci-operator/templates/openshift/endurance/endurance-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail
#!/bin/bash -x

# fetch the oc binary so we can talk to the cluster.
export PATH=$PATH:/tmp/shared/bin
Expand Down Expand Up @@ -154,8 +153,7 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail
#!/bin/bash -x

export PATH=$PATH:/tmp/shared/bin

Expand Down Expand Up @@ -379,8 +377,7 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
set -euo pipefail
#!/bin/sh -x

export PATH=$PATH:/tmp/shared/bin

Expand Down
6 changes: 2 additions & 4 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
set -euo pipefail
#!/bin/sh
set -e

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
Expand Down Expand Up @@ -660,8 +660,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
4 changes: 1 addition & 3 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
#!/bin/sh
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
Expand Down Expand Up @@ -731,8 +731,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,8 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
#!/bin/sh
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch "${HOME}"/setup-success; else touch "${HOME}"/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
cat > "${HOME}"/run-tests.sh << 'EOF'
Expand Down
8 changes: 2 additions & 6 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,8 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
set -euo pipefail
set -x

#!/bin/sh
set -ex
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

Expand Down Expand Up @@ -517,8 +515,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,7 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
set -euo pipefail

#!/bin/sh
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
# Wait untill lease is acquired
Expand Down Expand Up @@ -451,8 +449,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
4 changes: 1 addition & 3 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
#!/bin/sh
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
Expand Down Expand Up @@ -566,8 +566,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
4 changes: 1 addition & 3 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,8 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
#!/bin/sh
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

Expand Down Expand Up @@ -1856,7 +1855,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
Expand Down
6 changes: 2 additions & 4 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,8 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
set -euo pipefail

#!/bin/sh
set -e
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

Expand Down Expand Up @@ -1074,7 +1073,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-ansible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function teardown() {
set +e
touch /tmp/shared/exit
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-openshift-jenkins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function teardown() {
set +e
touch /tmp/shared/exit
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function teardown() {
set +e
touch /tmp/shared/exit
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function teardown() {
set +e
touch /tmp/shared/exit
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function teardown() {
set +e
touch /tmp/shared/exit
Expand Down
6 changes: 1 addition & 5 deletions ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,7 @@ objects:
- /bin/sh
- -c
- |
#!/bin/bash
set -euo pipefail

#!/bin/sh
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
cp "$(command -v openshift-install)" /tmp
Expand Down Expand Up @@ -364,8 +362,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

function queue() {
local TARGET="${1}"
shift
Expand Down
4 changes: 2 additions & 2 deletions ci-operator/templates/openshift/openshift-azure/cluster-launch-e2e-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ objects:
- -c
- |
#!/bin/bash
# error handling and sync code
set -euo pipefail

trap 'touch /tmp/shared/exit' EXIT
Expand Down Expand Up @@ -270,7 +271,7 @@ objects:
- /bin/bash
- -c
- |
#!/bin/bash
#!/bin/bash
set -euo pipefail

trap 'rc=$?; if [[ $rc -ne 0 ]]; then
Expand Down Expand Up @@ -360,7 +361,6 @@ objects:
- -c
- |
#!/bin/bash
set -euo pipefail

# teardown is collecting debug data and deleting all used resources
function teardown() {
Expand Down