Merge pull request #2680 from wking/re-background-create-cluster

ci-operator/templates/openshift/installer: Restore backgrounded 'create cluster'
openshift · Jan 24, 2019 · 65365da · 65365da
2 parents a16e55f + 4472ace
commit 65365da
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
@@ -299,7 +299,7 @@ objects:
  - |
  #!/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}; fi' TERM
+ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
  mkdir /tmp/artifacts/installer &&
  /bin/openshift-install version >/tmp/artifacts/installer/version
@@ -373,7 +373,8 @@ objects:
  exit 1
  fi
 
- /bin/openshift-install --dir=/tmp/artifacts/installer create cluster
+ /bin/openshift-install --dir=/tmp/artifacts/installer create cluster &
+ wait "$!"
 
  # Performs cleanup of all created resources
  - name: teardown

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml
@@ -173,7 +173,7 @@ objects:
  #!/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}; fi' TERM
+ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
  cat > "${HOME}"/router-check.sh << 'EOF'
  #!/bin/bash
  set -euo pipefail

diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
@@ -264,7 +264,7 @@ objects:
  - |
  #!/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}; fi' TERM
+ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
  mkdir /tmp/artifacts/installer &&
  /bin/openshift-install version >/tmp/artifacts/installer/version
@@ -338,7 +338,8 @@ objects:
  exit 1
  fi
 
- /bin/openshift-install --dir=/tmp/artifacts/installer create cluster
+ /bin/openshift-install --dir=/tmp/artifacts/installer create cluster &
+ wait "$!"
 
  # Performs cleanup of all created resources
  - name: teardown

diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml
@@ -262,7 +262,7 @@ objects:
  - |
  #!/bin/sh
  trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/config-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
- trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN}; fi' TERM
+ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
  mkdir /tmp/artifacts/installer &&
  /bin/openshift-install version >/tmp/artifacts/installer/version

diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
@@ -303,7 +303,7 @@ objects:
  - |
  #!/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}; fi' TERM
+ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM
 
  mkdir /tmp/artifacts/installer &&
  /bin/openshift-install version >/tmp/artifacts/installer/version