distro: fix issues with yaml distro definitions and enable yaml checks #1702

achilleas-k · 2025-07-29T11:45:50Z

distro/rhel9: remove duplicate anchors from yaml definitions

I've been using yq a lot to get a flattened view of our yaml
definitions, with all references resolved. While yamllint doesn't
seem to mind duplicated anchors, yq fails when they are found.

Duplicate anchors create ambiguity. Remove them.

platform_override_conditions_ami: never referenced, so it is
unnecessary.
default_partition_table_part_boot_payload: defined three times with
the same body. Convert the two extra anchors to references.

distro/rhel8: remove duplicate anchors from yaml definitions

platform_override_conditions_ami is never referenced, so it is
unnecessary.

distro/defs: fix up issues in distros.yaml

Fix issues caught by yamllint on distros.yaml:

Document start marker (---).
Comment indentation level.

github: run yamllint and yq on distro definitions

Check our yaml distro definitions for errors and warnings.

yamllint is run with --strict to convert warnings to errors. Let's be
as clean as possible.
yq is also used because it will fail when a file has multiple anchors
with the same name.

I've been using `yq` a lot to get a flattened view of our yaml definitions, with all references resolved. While `yamllint` doesn't seem to mind duplicated anchors, `yq` fails when they are found. Duplicate anchors create ambiguity. Remove them. - platform_override_conditions_ami: never referenced, so it is unnecessary. - default_partition_table_part_boot_payload: defined three times with the same body. Convert the two extra anchors to references.

platform_override_conditions_ami is never referenced, so it is unnecessary.

Fix issues caught by yamllint on distros.yaml: - Document start marker (---). - Comment indentation level.

Check our yaml distro definitions for errors and warnings. yamllint is run with `--strict` to convert warnings to errors. Let's be as clean as possible. yq is also used because it will fail when a file has multiple anchors with the same name.

mvo5

Thank you!

supakeen

Thanks; since this is a YAML cleanup PR I just noticed that in Fedora there's an (unused) default_kernel_optons; is that something you want to drop here as well?

ondrejbudai

love this!

achilleas-k · 2025-07-29T13:35:43Z

Thanks; since this is a YAML cleanup PR I just noticed that in Fedora there's an (unused) default_kernel_optons; is that something you want to drop here as well?

oh good catch. This PR is queued to merge now, so let's do it separately.

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 ---

achilleas-k added 3 commits July 29, 2025 13:06

distro/rhel8: remove duplicate anchors from yaml definitions

412cee7

platform_override_conditions_ami is never referenced, so it is unnecessary.

distro/defs: fix up issues in distros.yaml

a4526fe

Fix issues caught by yamllint on distros.yaml: - Document start marker (---). - Comment indentation level.

achilleas-k requested a review from a team as a code owner July 29, 2025 11:45

achilleas-k requested review from croissanne, mvo5 and thozza July 29, 2025 11:45

achilleas-k force-pushed the yaml/fix-duplicate-anchors branch 2 times, most recently from b86a758 to 7c90598 Compare July 29, 2025 11:52

achilleas-k force-pushed the yaml/fix-duplicate-anchors branch from 7c90598 to cd1eb82 Compare July 29, 2025 11:54

mvo5 approved these changes Jul 29, 2025

View reviewed changes

supakeen approved these changes Jul 29, 2025

View reviewed changes

ondrejbudai approved these changes Jul 29, 2025

View reviewed changes

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

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 29, 2025

achilleas-k added this pull request to the merge queue Jul 29, 2025

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

achilleas-k deleted the yaml/fix-duplicate-anchors branch July 29, 2025 16:01

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

distro: fix issues with yaml distro definitions and enable yaml checks #1702

distro: fix issues with yaml distro definitions and enable yaml checks #1702

Uh oh!

achilleas-k commented Jul 29, 2025

Uh oh!

mvo5 left a comment

Uh oh!

supakeen left a comment

Uh oh!

ondrejbudai left a comment

Uh oh!

achilleas-k commented Jul 29, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

distro: fix issues with yaml distro definitions and enable yaml checks #1702

distro: fix issues with yaml distro definitions and enable yaml checks #1702

Uh oh!

Conversation

achilleas-k commented Jul 29, 2025

Uh oh!

mvo5 left a comment

Choose a reason for hiding this comment

Uh oh!

supakeen left a comment

Choose a reason for hiding this comment

Uh oh!

ondrejbudai left a comment

Choose a reason for hiding this comment

Uh oh!

achilleas-k commented Jul 29, 2025

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants