[RHEL-10] add internal-only image types (COMPOSER-2357) #1067
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge the image generator functions used for the Azure images. One was used for the CentOS Stream and the other for RHEL images. However, the underlying image was exactly the same (WRT image config, partitioning, etc.). This change has no effect on the resulting manifests. Signed-off-by: Tomáš Hozza <[email protected]>
I'm not sure if this was initially missed for RHEL-10, but the RHEL-9 VHD image imports the RHEL RPM GPG key by default. There's no good reason to not do the same on RHEL-10. Fix the image definition. Signed-off-by: Tomáš Hozza <[email protected]>
The image definition is based on RHEL-9. The image type default PT is LVM-based and has `/boot` on a separate partition, because we don't support `/boot` on LVM. Signed-off-by: Tomáš Hozza <[email protected]>
The image definition is based on RHEL-9. The image type default PT is LVM-based and has `/boot` on a separate partition, because we don't support `/boot` on LVM. The `gtk2` package has been commented out from the default SAP package set, because it is not available on RHEL-10. Signed-off-by: Tomáš Hozza <[email protected]>
There's no reason to define a separate build package set for any EC2 images, because any required packages will be automatically added to the build pipeline pkgset by the pipeline implementation. Signed-off-by: Tomáš Hozza <[email protected]>
Move function definitions within the file to be in a similar order and structure as the Azure definitions file. Signed-off-by: Tomáš Hozza <[email protected]>
The constants used for kernel options for EC2 images share some parts. Let's refactor them to make differences easier to spot. Also don't use string literals on multiple places. Signed-off-by: Tomáš Hozza <[email protected]>
RHEL-9 AMI has been reworked as part of the RHSM auto-reg v2, which resulted in all RHSM and RHUI specific parts to be removed from the image definitions. This allowed to simplify them and some functions were renamed as part of it. Carry over the function names used in RHEL-9 to RHEL-10, to make things more consistent across these distributions. Signed-off-by: Tomáš Hozza <[email protected]>
Define a common ec2Aarch64Platform and use it everywhere in the future when there will be more than one EC2 Aarch64 image types. Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
|
I did some unification of image definition code (just moving things around so that files in different distros look as similar as possible) as part of this work, but I'll submit it as a separate PR. |
achilleas-k
approved these changes
Nov 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add the following image types:
These are based on RHEL-9 versions, with one difference for SAP images not including
gtk2andlibcanberra-gtk2packages removed from RHEL-10. The internal team working on SAP is aware of this, and we may need to adjust this eventually, but this is a good starting point.Related to https://issues.redhat.com/browse/COMPOSER-2357