test: move bootc-image-builder integration tests here #407
Conversation
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
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.
mvo5
requested review from
achilleas-k,
lzap and
thozza
and removed request for
a team
Closed
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).
mvo5
force-pushed
the
move-bib-tests-no-history
branch
from
b6fdbc5 to
86667bc
Compare
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.
mvo5
force-pushed
the
move-bib-tests-no-history
branch
from
86667bc to
1813b42
Compare
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
force-pushed
the
move-bib-tests-no-history
branch
from
e7112f0 to
110baa7
Compare
This was referenced Dec 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR moves the bib integration tests into the image-builder-cli repository. This is important now that we build bootc-image-builder as part of image-builder-cli. Some adjustments were needed and they are documented in the various commits. Ideally we would do a followup that also unifies the Containerfile.bib and github.com/osbuild/bootc-image-builder:Containerfile as much as possible and then have a test that detects/errors on drift. At least until we start building the konflux and GH container of bib here we will need a Contianerfile in the bib repository.
This PR is an alternative to #398 - it does not import the git history because this leads to GH not allowing a merge and means we need to force push to main (I'm usually a fan of keeping the history but I'm not so sure here). The history is still be available of course just not as part of the bib repo. I can of course also go back to #398 if that is preferred.