From ec1dee471f8a4e7fcc13c6cef6116ea904521a8a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 26 Aug 2020 16:19:57 -0700 Subject: [PATCH] templates/installer: fix heredoc redirection > If any part of word is quoted, the delimiter is the result of quote > removal on word, and the lines in the here-document are not expanded. http://www.gnu.org/savannah-checkouts/gnu/bash/manual/bash.html#Here-Documents --- .../cluster-launch-installer-libvirt-e2e.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 index 94c40f512897f..af681b9d56d00 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml @@ -201,20 +201,20 @@ objects: trap 'rc=$?; if test "${rc}" -eq 0; then touch "${HOME}"/setup-success; else touch "${HOME}"/exit "${HOME}"/setup-failed; fi; exit "${rc}"' EXIT trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM - cat > "${HOME}"/run-tests.sh << 'EOF' + cat > "${HOME}"/run-tests.sh << EOF #!/bin/bash set -euo pipefail - export PATH=/home/packer:$PATH - mkdir -p /tmp/artifacts/junit + export PATH=/home/packer:\$PATH + mkdir -p ${ARTIFACT_DIR}/junit function run-tests() { - openshift-tests run "${TEST_SUITE}" \ - -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit + openshift-tests run "\${TEST_SUITE}" \ + -o ${ARTIFACT_DIR}/e2e.log --junit-dir ${ARTIFACT_DIR}/junit return 0 } set -eu - ${TEST_COMMAND} + \${TEST_COMMAND} EOF chmod +x "${HOME}"/run-tests.sh mock-nss.sh