Prep patches for layered image builds #3754
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
Just noticed this while looking at related code.
Right now, `--oscontainer` is handled by a systemd unit which runs `rpm-ostree rebase` and then reboots the system. The main disadvantage with this is that it means we don't actually get any logging of the pivot step since it happens before SSH comes up. But also, I want to make that switch support local OCI archives, but the way it's currently implemented won't work with that since there's no way to `DropFile()` it before this unit kicks in. Move handling that arg to `runTest()` time.
As part of openshift/os#799, we'll want to be able to run tests against the layered image. We want to be able to do that by pointing at the local file instead of having to push it to a registry first (which in the pipeline usually happens at the end).
Pass through `jq .`; this fixes the indentation of one key. Also for consistency, use lowercase for the `$id` of the `path` property in artifacts.
jlebon
force-pushed
the
pr/buildextend-layered-prep
branch
from
8cc63c6 to
7580894
Compare
jbtrystram
approved these changes
Mar 14, 2024
travier
reviewed
Mar 14, 2024
| for _, m := range tcluster.Machines() { | ||
| tcluster.RunCmdSyncf(m, "sudo rpm-ostree rebase --experimental %s", Options.OSContainer) | ||
| m.Reboot() | ||
| tcluster.RunCmdSyncf(m, "sudo rpm-ostree rebase --experimental %s", rebase_arg) |
There was a problem hiding this comment.
Only distantly related, but I think we can drop the --experimental now.
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.
Split out of #3753.
See individual commit messages.