Skip to content

Get CoreOS data from stream #1316

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

Closed
zaneb wants to merge 1 commit into from
+2 −2
Closed

Get CoreOS data from stream #1316

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
4 changes: 2 additions & 2 deletions ocp_install_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function build_installer() {
cd $OPENSHIFT_INSTALL_PATH
TAGS="libvirt baremetal" hack/build.sh
popd
cp "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" "$OCP_DIR"
"$OPENSHIFT_INSTALL_PATH/bin/openshift-install" coreos print-stream-json >"$OCP_DIR/rhcos.json" || cp "$OPENSHIFT_INSTALL_PATH/data/data/rhcos.json" "$OCP_DIR"

@hardys hardys Nov 30, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

We already create this file via print-stream-json here so we could perhaps only copy if the "old" file location is found here?

I actually found this issue a few days ago but forgot to push the patch (apologies!) hardys@c4b30ff so if you agree that approach is preferable I can just create a PR, or we can go with this approach.

@zaneb zaneb Nov 30, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I didn't bother to check in to how those two scripts interact. I assume you know what you're doing, so your fix is preferable since it's simpler :) Happy to close this one.

@hardys hardys Nov 30, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I don't have a strong preference, but with my approach we avoid running the openshift-install command twice, which I guess may be slightly faster and less noisy in the logs - it also means we can remove the copy completely when 4.7 reaches EOL.

I pushed #1317 - if you're happy with that we can close this one.

}

function baremetal_network_configuration() {
Expand Down Expand Up @@ -324,4 +324,4 @@ spec:
echo "${bmh}" >> "${outdir}/extras/extraworker-${worker_index}-bmh"
((worker_index+=1))
done
}
}