Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ objects:

OS_DEBUG=1 TF_LOG=trace openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug &
PID_OPENSHIFT_INSTALL=$!
echo "PID_OPENSHIFT_INSTALL=${PID_OPENSHIFT_INSTALL}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why drop this from up here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency around the wait. And so that it doesn't get lost from the copy files code block.


# Copy the ephemeral installer files in case there is a problem with them
mkdir /tmp/artifacts/openshift-installer-files
Expand All @@ -489,9 +488,13 @@ objects:
done

# wait for installer create cluster and return its status
# disable errexit on pipeline failures for the wait command
set +e
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: the RC handling which we're fixing up here was born with the template in #8271.

echo "wait for installer PID ${PID_OPENSHIFT_INSTALL}"
wait "${PID_OPENSHIFT_INSTALL}"
RC=$?
echo "RC=${RC}"
echo "wait for installer PID ${PID_OPENSHIFT_INSTALL} RC=${RC}"
set -e
if [ ${RC} -gt 0 ]
then
OS_DEBUG=1 TF_LOG=trace openshift-install --dir=/tmp/artifacts/installer wait-for install-complete --log-level=debug
Expand Down