Skip to content

Conversation

@zaneb
Copy link
Member

@zaneb zaneb commented Nov 30, 2021

The file data/data/rhcos.json no longer exists (replaced by
data/data/coreos/rhcos.json). If the installer binary is able to output
the new (stream) file, use that. Only fall back to using the old file
for older releases.

The file data/data/rhcos.json no longer exists (replaced by
data/data/coreos/rhcos.json). If the installer binary is able to output
the new (stream) file, use that. Only fall back to using the old file
for older releases.
@openshift-ci
Copy link

openshift-ci bot commented Nov 30, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please ask for approval from zaneb after the PR has been reviewed.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot requested review from celebdor and cybertron November 30, 2021 02:36
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"
Copy link

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.

Copy link
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.

Copy link

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.

@zaneb
Copy link
Member Author

zaneb commented Nov 30, 2021

/close

@openshift-ci openshift-ci bot closed this Nov 30, 2021
@openshift-ci
Copy link

openshift-ci bot commented Nov 30, 2021

@zaneb: Closed this PR.

Details

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants