osbuild: Fix changes done causing podman to fail #3814
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ravanelli
changed the title
jlebon
reviewed
Jun 3, 2024
src/runvm-osbuild
Outdated
| @@ -60,7 +60,7 @@ extra_kargs=$(getconfig "extra-kargs-string" "") | |||
| # set the OSTree repo and ref information | |||
| ostree_ref="" | |||
| ostree_repo="" | |||
| if [ -z "${deploy_via_container}" ]; then | |||
| if [ -n "${deploy_via_container}" ]; then | |||
There was a problem hiding this comment.
Hmm, I don't think that's right. If we're deploying via container, then we don't need the ostree_ref and ostree_repo variables. If we're not, then it means we're pulling from an OSTree repo so we do.
The Prow failure in CI is catching this (because RHCOS uses deploy-via-container: true but FCOS yet).
Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
|
I think coreos/fedora-coreos-pipeline#997 and the indentation fix here should get things working again. Dropped the second commit! |
jlebon
approved these changes
Jun 3, 2024
|
CI is failing on #3815. Just going to merge this over red instead of waiting for the fix since CI went past the point where it uses those files and we can verify more quickly that it fixes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix changes done in #3808 causing the podman CI to fail https://jenkins-fedora-coreos-pipeline.apps.ocp.fedoraproject.org/job/build-podman-os/63/