imgtestlib: use image-builder cmd, drop cmd/build/ (HMS-10298)#2462
Draft
avitova wants to merge 4 commits into
Draft
imgtestlib: use image-builder cmd, drop cmd/build/ (HMS-10298)#2462avitova wants to merge 4 commits into
avitova wants to merge 4 commits into
Conversation
supakeen
reviewed
Jun 25, 2026
|
|
||
| cmd = [ | ||
| "sudo", "-E", "./bin/image-builder", "build", image_type, | ||
| "--config", config_path, |
Member
There was a problem hiding this comment.
Where does --config come from?
Contributor
Author
There was a problem hiding this comment.
Yeah, you are right, this was never supported. But tests passed locally previously; that is odd. I believe we ignore non-existent flags then?
Member
|
You'll probably want to bump the Schutzbot seed if changing the build script I think? |
avitova
force-pushed
the
use-ib-not-build
branch
from
fbe0efc to
2490225
Compare
Wire new CLI flags --bootc-remote and --image-size through manifest so that test configs can be built via image-builder build/manifest. Related: HMS-10855
This commit swaps usage of build in tests to using image-builder directly. After swapping from build to image-builder in tests, it is possible to use options instead of solely just a config file. This commit extracts options from the json config: --ostree-ref, --ostree-url, --ostree-parent, --bootc-installer-payload-ref, --bootc-remote, --image-size, and --extra-repo. It also extracts the blueprint part of the config into a standalone file, so that it can be used for building with image-builder. Related: HMS-10855
avitova
force-pushed
the
use-ib-not-build
branch
3 times, most recently
from
eb1dfd3 to
c657c12
Compare
avitova
changed the title
avitova
force-pushed
the
use-ib-not-build
branch
2 times, most recently
from
ec75923 to
b172aa9
Compare
After swapping to image-builder from build, the CI for cross architecture integration test is failing with `fuse: device not found, try 'modprobe fuse' first`. This commit ensures it is present before running integration tests.
avitova
force-pushed
the
use-ib-not-build
branch
from
b172aa9 to
725109a
Compare
Member
|
While working on #2467, I saw this in the old bootc-image-builder github actions: - name: Workaround podman issues in GH actions
run: |
# see https://github.com/osbuild/bootc-image-builder/issues/446
sudo rm -rf /var/lib/containers/storage
sudo mkdir -p /etc/containers
echo -e "[storage]\ndriver = \"overlay\"\nrunroot = \"/run/containers/storage\"\ngraphroot = \"/var/lib/containers/storage\"" | sudo tee /etc/containers/storage.confMight be what's needed to get that cross-arch build to work. |
achilleas-k
reviewed
Jun 26, 2026
| manifestCmd.Flags().String("bootc-installer-payload-ref", "", `bootc installer payload ref`) | ||
| manifestCmd.Flags().String("bootc-default-fs", "", `default filesystem to use for the bootc install (e.g. ext4)`) | ||
| manifestCmd.Flags().Bool("bootc-no-default-kernel-args", false, `don't use the default kernel arguments`) | ||
| manifestCmd.Flags().Bool("bootc-remote", false, `use org.osbuild.skopeo sources instead of containers-storage`) |
Member
There was a problem hiding this comment.
I think using the osbuild stage names here isn't very helpful. We don't expect users of the CLI to know about osbuild internals so it's a bit of a layer violation, even though they appear in the output.
It'd be better to describe it in general terms, like:
"Pull bootc container from remote location instead of using it from local container storage"
The option could also use some workshopping. Maybe bootc-pull-container?
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I saw more possible approaches, such as splitting configs into two files: blueprint, and the options part. However, creating a temporary file for blueprint in /tmp sounds like a good option and keeps things clean. Let me know what you guys think.