Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions src/cmd-osbuild
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,23 @@ main() {
else
cmd="runvm_with_cache"
fi
$cmd -- /usr/lib/coreos-assembler/runvm-osbuild \

# Use the bootc install to-filesystem manifest for rawhide
# See discussion in https://github.com/coreos/coreos-assembler/pull/4224#pullrequestreview-3076134370
# Remove when we switch to use bootc install to-filesystem to all streams
releasever=${build%%.*}
with_bootc_install=""
if [ "$releasever" -ge 44 ]; then
with_bootc_install=".bootc"
fi
Comment on lines +409 to +416
Copy link
Member

Choose a reason for hiding this comment

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

This is effective, but brittle. It would probably give us the most flexibility if we made it configurable via an environment variable and also possibly a manifest setting like was done over in
coreos/fedora-coreos-config#3754 and 532225d

i.e. I could see us wanting to roll this out in next and also RHCOS 10/SCOS 10 first and having those knobs would help that.


# To get a shell in the osbuild supermin VM uncomment this.
# osbuild can be started with `bash tmp/build.<artifact>/cmd.sh`
# See comment about checkpoints in runvm-osbuild
# RUNVM_SHELL=1 \
$cmd -- /usr/lib/coreos-assembler/runvm-osbuild \
--config "${runvm_osbuild_config_json}" \
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}${with_bootc_install}.mpp.yaml" \
--outdir "${outdir}" \
--platforms "$(IFS=,; echo "${platforms[*]}")"

Expand Down
Loading
Loading