Skip to content

Conversation

@mvo5
Copy link
Collaborator

@mvo5 mvo5 commented Dec 16, 2025

Based on #407 but with an extra commit to test if we can speed up the runs further via pytest-xdist and 2 parallel runs.

mvo5 added 14 commits December 15, 2025 10:41
Move the integration tests from bootc-image-builder into
image-builder. With bootc-image-builder being merged into
image-builder we still want to run the integration tests
for bib because our goal is 100% compatibility. Note that
this does not preserve history. There is a PR [0] that
does that and while I'm a big fan in general I am not
sure its worth the trouble because GH will not allow us
to merge the repos and we need to manually force push
it. The history of the tests is still fully available
in the bootc-image-builder repo in cases it is needed.

[0] osbuild#398
Similar as the previous commit, this moves the bootc-image-builder
Containerfile into the image-builder repository. We need it
so that we can run the tests and to (long term) move the
building of the bib konflux/GH containers into image-builder.

For now it will only be used in the integration tests and the
container builds for bib still happen in
github.com/osbuild/bootc-image-builder.

We will also need to add a test that ensures that the two
files keep in sync (igorning the small differences that will
be needed).
This trivial canary binary is needed in the bootc-image-builder
container so we need to move it here too.
The containerfile needs some adjustments now that it run inside
bib.
Just like the previous commit, we need to move the workflow
over from bootc-image-builder before we can adjust it.
Adjust the workflow for the different test file path,
updated go version and update name.

This also means dropping shellcheck, golang-ci and unit tests
which are already run by other workflows (or not needed
like shellcheck).
Now that we have two places that need to run the same build
comamnd just consolidate things into the Makefile under
`make build`.

Note that this cannot move into the makefile as for bib we want
to build *with* cgo to have the chmod/chown logic work as those
need cgo/libnss (in the general case).
We run a stricter linting in image-builder-cli than we do
in bootc-image-builder. So the bibtests.yaml file needs
some adjustments. Usually I would just fold this into one
of the previous commit but as it moves the indent level it is
confusing if merged into the other one so this is its own.
The linter in image-builder is stricter than the one in bib
so this needs adjustments to apease the linter and spell
checker.
This test is no longer working, it seems its a result of the
merge of
osbuild#316

Drop it for now so that we can move forward with the merge.
There is a similar test in
https://github.com/osbuild/image-builder-cli/pull/316/files#diff-57c49abc8a31b46856c2eecb2edfeff6072cd8d0edf769a67b6d4fdaabd8321aR100
that does not cover "auto" but any fixes/regression should be
done in the ibcli repo.

See also osbuild/bootc-image-builder#1157
Our "bootc-installer" image installer checks that after the
install bootc status points to the right image. This check
is missing currently in the anaconda-iso installer type.

Lets make sure we have it too.
@mvo5
Copy link
Collaborator Author

mvo5 commented Dec 16, 2025

Hm, podman already fails early when running in parallel so this needs more work :(

@mvo5 mvo5 closed this Dec 16, 2025
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.

1 participant