rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

supakeen · 2025-07-29T20:11:45Z

We only had an azure-rhui image type that builds importable disk images for Azure. This image type was only enabled on RHEL.

In this PR I introduce a new image type (which is the same as azure-rhui) except under the azure name. This image type is available in all based-on-RHEL-but-not-RHELs (CentOS, Alma Linux, Alma Linux Kitten) where the rhui name doesn't make much sense.

Separately this PR drops system-reinstall-bootc from CentOS (and other non-RHEL) as requested by CentOS maintainer(s).

There's some weird duplication with the conditions here; I did that because we don't currently install system-reinstall-bootc on GCE, this is likely a bug? If we should include it there as well I can do that as part of this PR and remove the duplication or I can do a followup to generalize this :)

achilleas-k

Thanks. I'm approving but this does make me consider if our image type naming is confusing. In the beginning there was just vhd. Then came all the azure-rhui variants for the internal builds and marketplace. Now, on CentOS, we have vhd and azure, where azure matches the marketplace images and vhd is a simpler (no LVM) Azure-compatible image, basically.

The image descriptions on osbuild.org certainly help, but let's come back to this and reconsider our naming scheme.

supakeen · 2025-07-30T10:02:43Z

Thanks. I'm approving but this does make me consider if our image type naming is confusing. In the beginning there was just vhd. Then came all the azure-rhui variants for the internal builds and marketplace. Now, on CentOS, we have vhd and azure, where azure matches the marketplace images and vhd is a simpler (no LVM) Azure-compatible image, basically.

The image descriptions on osbuild.org certainly help, but let's come back to this and reconsider our naming scheme.

Agreed, and perhaps even a split between CentOS and RHEL definitions might make sense if we have more deviations. I'll put it somewhere so we don't forget.

ondrejbudai · 2025-07-30T11:01:36Z

I'm deeply concerned about the system-reinstall-bootc change. I would love if CentOS and RHEL images are as similar as possible because of the whole upstream-downstream relationship. If there are no technical reasons to drop it, it should stay there.

supakeen · 2025-07-30T11:52:09Z

I'm deeply concerned about the system-reinstall-bootc change. I would love if CentOS and RHEL images are as similar as possible because of the whole upstream-downstream relationship. If there are no technical reasons to drop it, it should stay there.

It seems like an issue should be filed in the CentOS project to request its inclusion. It's currently not in their Lorax-produced images. So technically this isn't a change, it'd be a change to start including it.

achilleas-k · 2025-07-30T12:00:40Z

Looks like this is going to get popped off the merge queue because of conflicts :(

supakeen · 2025-07-30T12:05:42Z

Looks like this is going to get popped off the merge queue because of conflicts :(

Ah, I'll rebase after then.

supakeen · 2025-07-30T13:35:01Z

@achilleas-k / @mvo5 this has been rebased, could you re-ack?

The Azure image type for RHEL is called `azure-rhui`; however the `rhui` part doesn't make much sense for non-RHUI distros such as CentOS, and Alma Linux. Define another image type called `azure` that's available to those distributions. Signed-off-by: Simon de Vlieger <[email protected]>

CentOS maintainers have asked to drop `system-reinstall-bootc` from CentOS. This looks kinda weird with the duplication everywhere, but I noticed that I can't just include `system-reinstall-bootc` on all RHEL image types by sharing the condition block as some image types lack them right now. Signed-off-by: Simon de Vlieger <[email protected]>

tag v0.165.0 Tagger: imagebuilder-bot <[email protected]> Changes with 0.165.0 ---------------- * distro: move rhel9 into a generic distro (osbuild/images#1645) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * Revert "distro: drop `ImageType.BasePartitionTable()`" (osbuild/images#1691) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * Update dependencies 2025-07-20 (osbuild/images#1675) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * defs: add missing `bootstrap_containers` (osbuild/images#1679) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * disk: handle adding `PReP` partition on PPC64/s390x (HMS-8884) (osbuild/images#1681) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: bring per-distro checkOptions back (osbuild/images#1678) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: cleanups in the pkg/distro/generic area (osbuild/images#1686) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: move rhel8 into a generic distro (osbuild/images#1643) * Author: Michael Vogt, Reviewers: Nobody * distro: small followups for PR#1682 (osbuild/images#1689) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * distro: unify transform/match into a single concept (osbuild/images#1682) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distros: de-duplicate runner build packages for centos10 (osbuild/images#1680) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * github: disable Go dep updates through dependabot (osbuild/images#1683) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * repos: include almalinux 9.6 (osbuild/images#1677) * Author: Simon de Vlieger, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: wsl distribution config (osbuild/images#1694) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * test/manifests/all-customizations: don't embed local file via URI (osbuild/images#1684) * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Brian C. Lane — Somewhere on the Internet, 2025-07-28 --- tag v0.166.0 Tagger: imagebuilder-bot <[email protected]> Changes with 0.166.0 ---------------- * customizations/subscription: conditionally enable semanage call (HMS-8866) (osbuild/images#1673) * Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Michael Vogt * distro/rhel-10: versionlock shim-x64 in the azure-cvm image (osbuild/images#1697) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Simon de Vlieger * manifestmock: move container/pkg/commit mocks into helper (osbuild/images#1700) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel9: `vagrant-libvirt`, `vagrant-virtualbox` (osbuild/images#1693) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * rhel{9,10}: centos WSL refinement (HMS-8922) (osbuild/images#1690) * Author: Simon de Vlieger, Reviewers: Ondřej Budai, Sanne Raymaekers, Tomáš Hozza — Somewhere on the Internet, 2025-07-29 --- tag v0.167.0 Tagger: imagebuilder-bot <[email protected]> Changes with 0.167.0 ---------------- * RHEL/Azure: drop obsolete WAAgentConfig keys [RHEL-93894] and remove loglevel kernel option [RHEL-102372] (osbuild/images#1611) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Sanne Raymaekers * Update dependencies 2025-07-27 (osbuild/images#1699) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: set default_kernel to kernel-uki-virt (osbuild/images#1704) * Author: Achilleas Koutsou, Reviewers: Ondřej Budai, Simon de Vlieger * distro: drop legacy loaders and update tests (osbuild/images#1687) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distro: fix issues with yaml distro definitions and enable yaml checks (osbuild/images#1702) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Simon de Vlieger — Somewhere on the Internet, 2025-07-30 --- tag v0.168.0 Tagger: imagebuilder-bot <[email protected]> Changes with 0.168.0 ---------------- * distro: fix bug in variable substitution for static distros (osbuild/images#1710) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel{9,10}: azure for non-RHEL (HMS-8949) (osbuild/images#1707) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt — Somewhere on the Internet, 2025-07-30 ---

supakeen requested a review from a team as a code owner July 29, 2025 20:11

supakeen requested review from achilleas-k, croissanne and thozza July 29, 2025 20:11

supakeen force-pushed the azure-for-centos branch from b4d1f4a to db4e4ce Compare July 29, 2025 20:12

supakeen requested review from mvo5 and ondrejbudai July 29, 2025 20:14

achilleas-k previously approved these changes Jul 30, 2025

View reviewed changes

mvo5 previously approved these changes Jul 30, 2025

View reviewed changes

supakeen added this pull request to the merge queue Jul 30, 2025

github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jul 30, 2025

supakeen dismissed stale reviews from mvo5 and achilleas-k via f4e4a65 July 30, 2025 13:34

supakeen force-pushed the azure-for-centos branch from db4e4ce to f4e4a65 Compare July 30, 2025 13:34

supakeen enabled auto-merge July 30, 2025 13:35

supakeen requested review from achilleas-k and mvo5 July 30, 2025 13:36

supakeen added 2 commits July 30, 2025 15:39

supakeen force-pushed the azure-for-centos branch from f4e4a65 to 5c76609 Compare July 30, 2025 13:43

achilleas-k approved these changes Jul 30, 2025

View reviewed changes

mvo5 approved these changes Jul 30, 2025

View reviewed changes

supakeen added this pull request to the merge queue Jul 30, 2025

Merged via the queue into osbuild:main with commit de6f5a7 Jul 30, 2025
22 checks passed

supakeen deleted the azure-for-centos branch July 30, 2025 15:30

achilleas-k mentioned this pull request Jul 31, 2025

go.mod: update osbuild/images to v0.168.0 osbuild/osbuild-composer#4799

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

Uh oh!

supakeen commented Jul 29, 2025 •

edited

Loading

Uh oh!

achilleas-k left a comment

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

ondrejbudai commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025 •

edited

Loading

Uh oh!

achilleas-k commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

Uh oh!

Conversation

supakeen commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

achilleas-k left a comment

Choose a reason for hiding this comment

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

ondrejbudai commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

achilleas-k commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

supakeen commented Jul 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

supakeen commented Jul 29, 2025 •

edited

Loading

supakeen commented Jul 30, 2025 •

edited

Loading