Skip to content
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.

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

fedora: image type names follow variants #1233

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

supakeen
Copy link
Member

Fedora consists of many variants. Historically we haven't really based our own definitions on anything. Let's introduce variant name prefixes to all Fedora image types to indicate what variant they are based on.

The next commit will then make these variants similar to (or equal to) the Fedora variants as they are supposed to be.

We keep the old image type names around as aliases since changing them is a breaking change. We should however consider deprecating them and emitting a warning for some time.

@supakeen supakeen requested a review from a team as a code owner February 18, 2025 10:58
@supakeen
Copy link
Member Author

I'll assume this needs discussion and followups :)

@supakeen supakeen marked this pull request as draft February 18, 2025 11:02
@supakeen supakeen force-pushed the type-names-follow-variant-names branch from d11c310 to 9f26ac2 Compare February 18, 2025 12:34
@supakeen
Copy link
Member Author

The config map commit needs more changes as the image types are now different between various distros they need to be split out; which means duplicating the files since those are the paths.

@supakeen supakeen force-pushed the type-names-follow-variant-names branch from 9f26ac2 to ed637c6 Compare February 18, 2025 12:39
@achilleas-k
Copy link
Member

achilleas-k commented Feb 18, 2025

which means duplicating the files since those are the paths.

Not necessary. The image type names don't need to all be valid for each distro, so for example you can have

diff --git a/test/config-map.json b/test/config-map.json
index e8add2b20..4d548d7b0 100644
--- a/test/config-map.json
+++ b/test/config-map.json
@@ -135,6 +135,7 @@
       "gce",
       "gce-rhui",
       "image-installer",
+      "minimal-installer",
       "iot-bootable-container",
       "iot-container",
       "live-installer",
@@ -264,7 +265,8 @@
       "x86_64"
     ],
     "image-types": [
-      "image-installer"
+      "image-installer",
+      "minimal-installer"
     ]
   },
   "./configs/unattended-iso.json": {

and it will work. Just add the new names in the same lists where the old names were.

@supakeen
Copy link
Member Author

and it will work. Just add the new names in the same lists where the old names were.

Ah that's good, I'll do that :)

@schutzbot
Copy link
Contributor

This PR changes the images API or behaviour causing integration failures with osbuild-composer. The next update of the images dependency in osbuild-composer will need work to adapt to these changes.

This is simply a notice. It will not block this PR from being merged.

@supakeen supakeen mentioned this pull request Feb 24, 2025
@supakeen
Copy link
Member Author

This PR changes the images API or behaviour causing integration failures with osbuild-composer. The next update of the images dependency in osbuild-composer will need work to adapt to these changes.

This is simply a notice. It will not block this PR from being merged.

Names will need to be updated in osbuild-composer after this merges as well. It can probably request the old names but it reports back the new names.

@supakeen
Copy link
Member Author

@achilleas-k I might be missing something but the Schutzbot CI fails on:

❌ 2 distro/arch/image combinations have no builds in the cache
   1: fedora-41/x86_64/server-wsl
   2: fedora-40/x86_64/server-wsl

I think I have server-wsl listed under ./configs/empty.json?

@supakeen supakeen force-pushed the type-names-follow-variant-names branch 7 times, most recently from 0e79ff7 to 21bd60f Compare February 24, 2025 20:21
Fedora consists of many variants. Historically we haven't really based
our own definitions on anything. Let's introduce variant name prefixes
to all Fedora image types to indicate what variant they are based on.

The next commit will then make these variants similar to (or equal to)
the Fedora variants as they are supposed to be.

We keep the old image type names around as aliases since changing them
is a breaking change. We should however consider deprecating them and
emitting a warning for some time.

Signed-off-by: Simon de Vlieger <[email protected]>
@supakeen supakeen force-pushed the type-names-follow-variant-names branch from 21bd60f to b3f4f8a Compare March 10, 2025 09:12
Adds in the new names where applicable, or replaces them where configs
only concern fedora.

Signed-off-by: Simon de Vlieger <[email protected]>
@supakeen supakeen force-pushed the type-names-follow-variant-names branch from b3f4f8a to bd9a845 Compare March 10, 2025 10:48
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.

3 participants