Skip to content

Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) #2145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
achilleas-k merged 2 commits into from
Jan 19, 2026
Merged

Ensure pinned osbuild version is used consistently in CI and build command. (HMS-10070) #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f816b5
GHA: ensure that the cross-arch QEMU test uses pinned osbuild
thozza Jan 19, 2026
abf5294
cmd/build: check minimum osbuild version before doing anything else
thozza Jan 19, 2026
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
16 changes: 10 additions & 6 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,16 @@ jobs:
image: registry.fedoraproject.org/fedora:latest
options: "--privileged"
steps:
- name: Install build and test dependencies
run: dnf -y install python3-pytest podman go btrfs-progs-devel device-mapper-devel gpgme-devel python3-pip qemu-system-s390x-core qemu-system-ppc64 qemu-user-static osbuild osbuild-depsolve-dnf cloud-utils
- name: Install build and test dependencies (without osbuild)
run: dnf -y install python3-pytest podman go btrfs-progs-devel device-mapper-devel gpgme-devel python3-pip qemu-system-s390x-core qemu-system-ppc64 qemu-user-static cloud-utils
- name: Check out code into the Go module directory
uses: actions/checkout@v6
with:
set-safe-directory: true
- name: Setup repository for pinned osbuild commit
run: ./test/scripts/setup-osbuild-repo
- name: Install osbuild dependencies
run: dnf -y install osbuild osbuild-depsolve-dnf
- name: Manually start qemu-user-static
run: |
# mostly for debugging
Expand All @@ -318,10 +326,6 @@ jobs:
ls /proc/sys/fs/binfmt_misc/
sudo SYSTEMD_LOG_LEVEL=debug /usr/lib/systemd/systemd-binfmt /usr/lib/binfmt.d/qemu-*.conf
ls /proc/sys/fs/binfmt_misc/
- name: Check out code into the Go module directory
uses: actions/checkout@v6
with:
set-safe-directory: true
- name: Cross arch integration test
run: |
pip install .
Expand Down
9 changes: 9 additions & 0 deletions cmd/build/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ func run() error {
os.Exit(1)
}

// NOTE: Check the minimum osbuild version before doing anything else.
// Building the manifest would fail, but we need to depsolve the packages
// also with the minimum osbuild version. Although the depsolve may fail
// with an error, it is for the best to fail with the version mismatch
// error.
if err := osbuild.CheckMinimumOSBuildVersion(); err != nil {
return err
}

distroFac := distrofactory.NewDefault()
config, err := buildconfig.New(configFile, nil)
if err != nil {
Expand Down
Loading