Skip to content

templates/installer: fix heredoc redirection #11313

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 28, 2020
Merged

templates/installer: fix heredoc redirection #11313

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
12 changes: 6 additions & 6 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 @@ -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
Expand Down