Factor out common RHEL parts and RHEL-10 from RHEL-9 (COMPOSER-2185) #529
Conversation
|
Very nice, I believe this will also fix #491? I'll do a review tomorrow. |
thozza
changed the title
rhel_common
thozza
changed the title
thozza
force-pushed
the
el10
branch
2 times, most recently
from
edae9f1
to
b14b2be
Compare
|
Snyk is complaining about an existing thing in |
thozza
force-pushed
the
el10
branch
4 times, most recently
from
52d3435
to
d15a968
Compare
thozza
force-pushed
the
el10
branch
2 times, most recently
from
a91df58
to
e0efc38
Compare
|
The PR is again ready for review. |
There was a problem hiding this comment.
Looks good overall. I didn't verify every single copy of the image types line-by-line since the test manifests haven't changed.
Two minor comments in-line: a file with a mistyped name and a question about the NewImageType() function.
SUPER NITPICK: One more thought: Could the common parts be moved to pkg/distro/rhel/ instead of being under pkg/distro/rhel/rhel_common? I'm not sure I like the repetition in the path (though, unavoidable I guess), the name with the _, and I kinda like the idea of the common bits being one level above the version-specific code.
So instead of:
pkg/distro/
└── rhel
├── rhel10
├── rhel9
└── rhel_common
we'd have:
pkg/distro
└── rhel
├── rhel10
└── rhel9
Thanks a lot for the review!
I don't have a strong opinion on this. I'm happy to move the common code to |
|
I fixed typos in filenames and moved |
|
@thozza Tiny merge conflict :( |
As the first step towards defining el10 and el9 in without completely forking the `rhel9` distro, create a common `rhel` directory and move `rhel9` under it. The idea is to then extract the parts that should be shared across RHEL distros under `rhel` package and export necessary structs and functions from it and make use of them. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
Create new package under `distro/rhel`, called `rhel`. The intention is to factor out all code which should be common across RHEL versions into this new package. Specific RHEL version distro implementations will then use this code and own mostly their package set and configuration. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
While extracting RHEL-10 from RHEL-9, I noticed that the test passes even if the listed image types are not supported by the distro, which didn't seem right. Fix that. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
And base it on the common `rhel` package. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529
Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529
Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529 also updating images and osbuild-composer repos
Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529 also updating images and osbuild-composer repos
Just a followup of https://issues.redhat.com/browse/COMPOSER-2185 and it's PR osbuild/images#529 also updating images and osbuild-composer repos
This is the first step in defining RHEL distros by reusing most of the code which is not release-specific. Each release will then define its package sets, partition tables, image configurations. The rest will be shared among distros.
I factored out the "common" RHEL code into
rhelpackage, which is now used byrhel9. Subsequently, I factored outrhel10out ofrhel9and reverted the conditionals inrhel9distro code which were necessary to incorporaterhel10.I verified that no el9 / c9s / el10 / c10s manifests have been changed by these changes.