Skip to content

Conditionally copy rhcos.json #1317

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
Dec 3, 2021
Merged

Conditionally copy rhcos.json #1317

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: 8 additions & 1 deletion ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,14 @@ function build_installer() {
cd $OPENSHIFT_INSTALL_PATH
TAGS="libvirt baremetal" hack/build.sh
popd
cp "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" "$OCP_DIR"
# This is only needed in rhcos.sh for old versions which lack the
# openshift-install coreos-print-stream-json option
# That landed in 4.8, and in 4.10 this file moved, so just
# skip copying it if it's not in the "old" location ref
# https://github.com/openshift/installer/pull/5252
if [ -f "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" ]; then
Copy link
Member

@elfosardo elfosardo Dec 1, 2021

Choose a reason for hiding this comment

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

nit: "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" should probably be yet another variable

Copy link
Author

@hardys hardys Dec 1, 2021

Choose a reason for hiding this comment

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

It wasn't a variable before, and the path is decided by the installer repo - I don't understand under what circumstances someone would want to override this path, can you elaborate?

cp "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" "$OCP_DIR"
fi
}

function baremetal_network_configuration() {
Expand Down