Skip to content

go.mod: bump osbuild/images to v0.236.0 (HMS-10105)#441

Merged
thozza merged 5 commits intoosbuild:mainfrom
thozza:HMS-10105
Feb 5, 2026
Merged

go.mod: bump osbuild/images to v0.236.0 (HMS-10105)#441
thozza merged 5 commits intoosbuild:mainfrom
thozza:HMS-10105

Conversation

@thozza
Copy link
Member

@thozza thozza commented Jan 26, 2026

This bumps the osbuild/images to the version that uses depsolver V2 API.

Additional changes:

  • Add test/scripts/setup-osbuild-repo to configure dnf repository from osbuild CI S3 bucket when a commit is pinned
  • Add test/scripts/check-osbuild-version to verify installed osbuild packages meet minimum version requirements
  • Add Schutzfile for dependency version pinning configuration
  • Update GitHub Actions workflow to vendor dependencies, setup osbuild repo, and verify versions before running tests
  • Update CI container from Fedora 41 (EOL) to Fedora 43
  • Bump minimum osbuild version requirement from 167 to 170 in RPM spec
  • Share osbuild store between test builds to reduce disk usage and speed up CI
  • Switch tests from minimal-raw to qcow2 to work around upstream /boot partition size bug (osbuild/images#2176)

osbuild/images changes

Changes with 0.235.0


  • Align the bootc distro package with the generic one (#2136)
    • Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza
  • Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) (#2145)
    • Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger
  • GHA: bump used golangci-lint version to 2.8 (HMS-10069) (#2144)
    • Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Lukáš Zapletal
  • Update osbuild dependency commit ID (#2141)
    • Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza
  • Use the correct libvirt pool instead of hardcoded default (#2147)
    • Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  • boot-image: add make_check_host_config to boot-aws (#2143)
    • Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza
  • osbuild: add force option to org.osbuild.groups and always enable [HMS-9825] (#2146)
    • Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Lukáš Zapletal, Tomáš Hozza

— Somewhere on the Internet, 2026-01-26


Changes with 0.236.0


  • Add V2 depsolver API support and make it the default (HMS-10029) (#2139)
    • Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger

— Somewhere on the Internet, 2026-01-26

@thozza thozza requested a review from a team as a code owner January 26, 2026 10:36
@thozza thozza requested review from achilleas-k, bcl and lzap and removed request for a team January 26, 2026 10:36
@thozza thozza marked this pull request as draft January 26, 2026 10:42
lzap
lzap previously approved these changes Jan 26, 2026
@supakeen
Copy link
Member

Failing on empty depsolve results.

@lzap
Copy link
Contributor

lzap commented Jan 29, 2026

Failing on empty depsolve results.

Just for the record, I realized that the error handling code simply hides the root cause, very likely the utility now returns non-zero code and this is swallowed. I filed a patch this week to fix this: osbuild/images#2156

@lzap
Copy link
Contributor

lzap commented Jan 29, 2026

Rebased, removed the struct tag, fixed tests.

@thozza
Copy link
Member Author

thozza commented Jan 29, 2026

Note that the problem with this PR is that the test case uses osbuild from the Fedora official distros, which worked until now only by luck. The test should ideally also build RPMs and install those, which would clearly signal that the installed osbuild version is too old. In addition, this repo needs to gain a way to pin a newer version of osbuild, than what is available in Fedora repositories.

@thozza thozza force-pushed the HMS-10105 branch 3 times, most recently from 1e13387 to b186389 Compare February 4, 2026 20:02
The osbuild packages installed from Fedora repositories may be too old
to work correctly with the vendored osbuild/images library. This can
cause tests to fail with cryptic errors when the images library requires
features from a newer osbuild version.

This commit adds two scripts and a Schutzfile to handle this:

- test/scripts/setup-osbuild-repo: Sets up a dnf repository pointing to
  pre-built osbuild RPMs from the osbuild CI S3 bucket when a specific
  commit is pinned in Schutzfile. This allows using newer osbuild
  versions than what's available in Fedora.

- test/scripts/check-osbuild-version: Verifies that installed osbuild
  and osbuild-depsolve-dnf packages meet the minimum version requirement
  specified by the vendored osbuild/images library.

When bumping the osbuild/images version, if the Fedora osbuild package
is too old, one can pin a compatible osbuild commit in Schutzfile to
unblock CI. This is consistent with what we do in other repositories.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This bumps the osbuild/images to the version that uses depsolver V2
API.

Also bump the minimum required osbuild version and pin it in the
Schutzfile.

Changes with 0.235.0

----------------
  - Align the bootc distro package with the generic one (#2136)
    - Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza
  - Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) (#2145)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - GHA: bump used golangci-lint version to 2.8 (HMS-10069) (#2144)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Lukáš Zapletal
  - Update osbuild dependency commit ID (#2141)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - Use the correct libvirt pool instead of hardcoded default (#2147)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - boot-image: add make_check_host_config to boot-aws (#2143)
    - Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza
  - osbuild: add force option to org.osbuild.groups and always enable [HMS-9825] (#2146)
    - Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Lukáš Zapletal, Tomáš Hozza

— Somewhere on the Internet, 2026-01-26

---

Changes with 0.236.0

----------------
  - Add V2 depsolver API support and make it the default (HMS-10029) (#2139)
    - Author: Tomáš Hozza, Reviewers: Lukáš Zapletal, Simon de Vlieger

— Somewhere on the Internet, 2026-01-26

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
@supakeen
Copy link
Member

supakeen commented Feb 5, 2026

Integration tests ran out of disk space; linters are unhappy about the osbuild version verification script.

@thozza
Copy link
Member Author

thozza commented Feb 5, 2026

Integration tests ran out of disk space; linters are unhappy about the osbuild version verification script.

I know, I know... I'm on it... 🫡

Add a shared osbuild store directory mounted into the test containers.
This reduces disk usage and speeds up builds by caching RPMs and
intermediate artifacts between test runs, consistent with how the
BIB tests handle storage.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
The minimal-raw image type for centos-9 has a /boot partition that is
too small (600 MiB) to fit the kernel, initramfs, and rescue initramfs.

The upstream bug is: osbuild/images#2176

With the sharing of osbuild store across builds, it makes even more
sense to build the same image type in all tests.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
@thozza thozza marked this pull request as ready for review February 5, 2026 14:31
@thozza thozza requested a review from supakeen February 5, 2026 14:31
@thozza thozza enabled auto-merge February 5, 2026 14:45
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

Awesome. LGTM

@thozza thozza added this pull request to the merge queue Feb 5, 2026
Merged via the queue into osbuild:main with commit 9991cf2 Feb 5, 2026
45 checks passed
@thozza thozza deleted the HMS-10105 branch February 5, 2026 16:34
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.

4 participants