rhel{9,10}: centos WSL refinement (HMS-8922) #1690

supakeen · 2025-07-24T19:41:10Z

After a short chat with CentOS folks (see the linked issue) they'd like to:

Use wsl-setup.
Drop cloud-init.
Drop subscription-manager.
Use centos-* named packages.

This PR makes those changes only for CentOS; all other RHEL-likes (RHEL, AlmaLinux, AlmaLinux Kitten) keep the RHEL-style WSL images with cloud-init and subscription-manager until we're ready to migrate RHEL as well.

supakeen · 2025-07-25T06:20:26Z

CI failing on wsl-setup not being available in CentOS 10; need to update snapshots.

mvo5

Thank you

thozza

LGTM in general.

The WSL image type should install some sensible RPM package group, instead of listing all packages explicitly. Comps groups already solve the problem of installing the *-release and *-logos, as well as subscription-manager, on CS versus RHEL. We could get rid of the conditions in our image definitions.

pkg/distro/defs/rhel-10/distro.yaml

supakeen · 2025-07-25T08:58:52Z

Note that this PR will need to be force-pushed for even newer snapshots :(

supakeen · 2025-07-25T11:39:14Z

Converting to draft until snapshots work, I'll also be applying this to CentOS 9 as well.

supakeen · 2025-07-25T12:13:09Z

Ok, this PR is now based on #1694 and adds a commit for a package that was missed in that PR (-logos). All commits have been rewritten to apply to both 9 and 10.

Rebasing and undrafting once #1694 lands in main.

Move WSL config to common as CentOS will not be using it in the next commit and this makes room for that. Signed-off-by: Simon de Vlieger <[email protected]>

Remove `subscription-manager` from the package set for CentOS Signed-off-by: Simon de Vlieger <[email protected]>

CentOS would like to be using the `wsl-setup` package to provision WSL instead of `cloud-init`. Signed-off-by: Simon de Vlieger <[email protected]>

Instead of configuring WSL manually use the wsl-setup package on CentOS. Signed-off-by: Simon de Vlieger <[email protected]>

Since we're writing the distribution config (or using wsl-setup in the case of centos) we need to install the logos package as well. This was missed in a previous PR. Signed-off-by: Simon de Vlieger <[email protected]>

On CentOS Stream use the centos- branded packages, while this makes no concrete difference (`centos-logos` and `centos-release` provide their `redhat-*` named counterparts) it looks prettier. Signed-off-by: Simon de Vlieger <[email protected]>

CentOS had a few different changes, I initially had them all as separate cases but I feel it's slightly more readable if I squash them all into two. Signed-off-by: Simon de Vlieger <[email protected]>

These should (hopefully) include the new `wsl-setup` package that has become available. Otherwise another rpmrepo snapshot is running at the moment. Signed-off-by: Simon de Vlieger <[email protected]>

croissanne

this lgtm thanks!

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.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 24, 2025 19:41

supakeen requested review from croissanne, mvo5 and thozza July 24, 2025 19:41

supakeen force-pushed the centos-wsl-changes branch from c6ef361 to 6ef8a76 Compare July 24, 2025 19:47

mvo5 previously approved these changes Jul 25, 2025

View reviewed changes

thozza previously approved these changes Jul 25, 2025

View reviewed changes

pkg/distro/defs/rhel-10/distro.yaml Show resolved Hide resolved

supakeen mentioned this pull request Jul 25, 2025

rhel9: wsl distribution config #1694

Merged

supakeen changed the title ~~defs/rhel10: centos WSL refinement (HMS-8922)~~ rhel10: centos WSL refinement (HMS-8922) Jul 25, 2025

supakeen dismissed stale reviews from thozza and mvo5 via d67daa1 July 25, 2025 11:37

supakeen force-pushed the centos-wsl-changes branch from 885ad92 to d67daa1 Compare July 25, 2025 11:37

supakeen marked this pull request as draft July 25, 2025 11:38

supakeen force-pushed the centos-wsl-changes branch 2 times, most recently from 3b5da40 to fafcd94 Compare July 25, 2025 12:12

supakeen changed the title ~~rhel10: centos WSL refinement (HMS-8922)~~ rhel{9,10}: centos WSL refinement (HMS-8922) Jul 25, 2025

supakeen added 3 commits July 25, 2025 16:18

rhel{9,10}: move wsl config

4f9a31c

Move WSL config to common as CentOS will not be using it in the next commit and this makes room for that. Signed-off-by: Simon de Vlieger <[email protected]>

defs/rhel10: no subscription-manager on CentOS

3918490

Remove `subscription-manager` from the package set for CentOS Signed-off-by: Simon de Vlieger <[email protected]>

rhel{9,10}: no cloud-init on CentOS

a8a0a06

CentOS would like to be using the `wsl-setup` package to provision WSL instead of `cloud-init`. Signed-off-by: Simon de Vlieger <[email protected]>

supakeen force-pushed the centos-wsl-changes branch from fafcd94 to ff17de9 Compare July 25, 2025 14:18

supakeen added 5 commits July 28, 2025 08:12

rhel{9,10}: use wsl-setup on centos

18efca8

Instead of configuring WSL manually use the wsl-setup package on CentOS. Signed-off-by: Simon de Vlieger <[email protected]>

rhel9: include redhat-logos

cf97b2b

Since we're writing the distribution config (or using wsl-setup in the case of centos) we need to install the logos package as well. This was missed in a previous PR. Signed-off-by: Simon de Vlieger <[email protected]>

rhel{9,10}: use centos- packages on centos

8c576b2

On CentOS Stream use the centos- branded packages, while this makes no concrete difference (`centos-logos` and `centos-release` provide their `redhat-*` named counterparts) it looks prettier. Signed-off-by: Simon de Vlieger <[email protected]>

rhel{9,10}: squash conditions for centos

33e5d74

CentOS had a few different changes, I initially had them all as separate cases but I feel it's slightly more readable if I squash them all into two. Signed-off-by: Simon de Vlieger <[email protected]>

test: update centos snapshots

374233a

These should (hopefully) include the new `wsl-setup` package that has become available. Otherwise another rpmrepo snapshot is running at the moment. Signed-off-by: Simon de Vlieger <[email protected]>

supakeen force-pushed the centos-wsl-changes branch from ff17de9 to 374233a Compare July 28, 2025 06:13

supakeen marked this pull request as ready for review July 28, 2025 07:23

croissanne approved these changes Jul 28, 2025

View reviewed changes

ondrejbudai approved these changes Jul 28, 2025

View reviewed changes

ondrejbudai added this pull request to the merge queue Jul 28, 2025

thozza approved these changes Jul 28, 2025

View reviewed changes

Merged via the queue into osbuild:main with commit 3da31ae Jul 28, 2025
21 checks passed

achilleas-k mentioned this pull request Jul 30, 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}: centos WSL refinement (HMS-8922) #1690

rhel{9,10}: centos WSL refinement (HMS-8922) #1690

Uh oh!

supakeen commented Jul 24, 2025 •

edited

Loading

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

mvo5 left a comment

Uh oh!

thozza left a comment

Uh oh!

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

croissanne left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rhel{9,10}: centos WSL refinement (HMS-8922) #1690

rhel{9,10}: centos WSL refinement (HMS-8922) #1690

Uh oh!

Conversation

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

Uh oh!

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

mvo5 left a comment

Choose a reason for hiding this comment

Uh oh!

thozza left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

supakeen commented Jul 25, 2025

Uh oh!

croissanne left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

supakeen commented Jul 24, 2025 •

edited

Loading