Skip to content

Conversation

@supakeen
Copy link
Member

This is a pretty mechanical PR right up until the last two or three commits.

  1. Split InstallerCustomizations and InstallerConfig by introducing ISOCustomizations and ISOConfig. This unmuddies the waters a bit for options that apply only to installer(s) (really; mostly Anaconda) and the options that apply only to the assembling of the ISO artifact itself.
  2. Move some options between the two.

After that it implements the new options for the xorrisofs stage, adds them to the Fedora installers and implements the overriding of these fields through blueprints. The last bit will be necessary to produce these ISOs in Koji as this field is (normally) controlled through Pungi.

@supakeen supakeen requested a review from a team as a code owner December 20, 2025 08:10
@supakeen supakeen requested review from achilleas-k, bcl and lzap December 20, 2025 08:10
@supakeen supakeen force-pushed the moderniso-isocustomizations branch 2 times, most recently from 0d86fe9 to d28419a Compare December 20, 2025 08:25
lzap
lzap previously approved these changes Jan 2, 2026
Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Nicely done.

@supakeen supakeen changed the title many: iso configuration and customization many: iso configuration and customization (HMS-9963) Jan 5, 2026
@supakeen supakeen force-pushed the moderniso-isocustomizations branch from d28419a to 87feb3b Compare January 6, 2026 09:21
@supakeen supakeen force-pushed the moderniso-isocustomizations branch 2 times, most recently from 3200e9e to 5c255c7 Compare January 6, 2026 11:44
@supakeen
Copy link
Member Author

supakeen commented Jan 6, 2026

Rebased on main; dropped the additional 'Signed-off-by' line and updated the CI commit ids for osbuild hence the dismissal of your review @lzap.

Will need rebasing again after #2091 as the checksums will conflict so approvals right now will get dismissed again.

@supakeen supakeen force-pushed the moderniso-isocustomizations branch from 5c255c7 to 7a9c562 Compare January 6, 2026 15:14
@supakeen
Copy link
Member Author

supakeen commented Jan 6, 2026

Ok, this has now been rebased and is ready for review.

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.

LGTM. I agree with this split, it makes sense to me.

Small issue with the preparer string though (which we can decide on and change later).

Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Well if some CDROM emulator code in iDRAC won't crunch this, well, we will find out I guess :-) Probably this is fine.

@supakeen supakeen added this pull request to the merge queue Jan 7, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jan 7, 2026
@lzap lzap added this pull request to the merge queue Jan 7, 2026
@supakeen
Copy link
Member Author

supakeen commented Jan 7, 2026

Sadly re-adding this to the queue won't make it pass, the check @achilleas-k added in 44d2f85 is pretty consistently failing on a bunch of image types showing that the configuration file is apparently not being copied.

@supakeen supakeen removed this pull request from the merge queue due to a manual request Jan 7, 2026
@supakeen supakeen force-pushed the moderniso-isocustomizations branch from 7a9c562 to 58bcb28 Compare January 7, 2026 18:04
Copy link
Contributor

@bcl bcl left a comment

Choose a reason for hiding this comment

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

Looks nice!

Require a newer version of osbuild so we can make use of additional
added stage options.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Allow setting the newly added [1] additional fields for the xorrisofs
stage in the osbuild stage.

[1]: osbuild/osbuild#2269

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This includes support for setting the new ISO customizations.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Introduce a customizations struct for the ISO pipeline generator,
consistent with how we manage customizations for the OS, and installer
pipeline generators.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Add the ISO customizations to all installers and pass them along to the
ISO pipeline generator. Note that these customizations are not yet
filled in this is just the structural change.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Create a new configuration struct that determines options for ISO media.
This follows the same idea as we use for `image_config` (which likely
should be split out more) and `installer_config`.

Also introduce the function that will in the future handle merging of
the `iso_config` and any customization values and apply this function to
each image that includes `ISOCustomizations`.

Note that nothing here is really used yet still; this is only setup code
to be able to use the `ISOCustomizations` in the next commits.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Move the ISO label out of the installer customizations and into the ISO
customizations as it only applies to manifest pipelines that are packed
into ISOs, not to all potential installers.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
The root filesystem type for ISOs only applies to ISOs. Move it into the
ISO customizations instead of installer.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
The boot type for ISOs only applies to ISOs. Move it into the ISO
customizations instead of installer.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Instead of passing separate fields into the xorrisofs stage option
function pass all the customizations so they're more easily expanded.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Allow the configuration of additional metadata fields in
the YAML for the ISO.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Override any customization fields with their blueprint values if they
are set.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
Fill in the preparer and publisher fields for Fedora ISOs by default.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
@supakeen supakeen force-pushed the moderniso-isocustomizations branch from 58bcb28 to 4a3076f Compare January 8, 2026 10:51
@supakeen supakeen enabled auto-merge January 8, 2026 10:51
@supakeen supakeen added this pull request to the merge queue Jan 8, 2026
Merged via the queue into osbuild:main with commit e84f59d Jan 8, 2026
25 checks passed
@supakeen supakeen deleted the moderniso-isocustomizations branch January 8, 2026 15:44
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