Rewrite RHEL 7 image definitions using the new framework #3239
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
achilleas-k
changed the title
achilleas-k
force-pushed
the
rewrite/rhel7
branch
from
d09daa6 to
9878981
Compare
achilleas-k
force-pushed
the
rewrite/rhel7
branch
from
9878981 to
e4ae37c
Compare
schutzbot
reviewed
Jan 24, 2023
There was a problem hiding this comment.
Manifest-diff job [0] as manifests.diff.
thozza
reviewed
Jan 25, 2023
There was a problem hiding this comment.
Great to see the work converging. I added a few comments, but noting serious 😉
Also found a typo in 4344de0 commit message. Specifically The RHEL 7 vpc subformat in qemu does support force_size so we need to be able to disable it. is missing NOT in ..qemu does <HERE> support... 😎
Good catch, thanks. |
achilleas-k
force-pushed
the
rewrite/rhel7
branch
from
e4ae37c to
f0d8509
Compare
|
The qcow2 image type for RHEL 7 doesn't have packageset chains defined. This means that the blueprint packages are never merged into the os pipeline. This is unnecessary right now because of the upcoming rewrite, but it will minimise the differences that will show up in the manifest. The qcow2-customize manifest has an added block of options for the grub2.legacy stage because now the dracut-config-rescue package is being installed in the image.
Update the implementation of the distro.Distro interface to match the one in RHEL 8, 9, and Fedora. The main change is that the runner is a runner.Runner and not a string. The runner name is now rhel79 (changed from rhel7). This is functionally equivalent based on osbuild's runner version fallback logic.
No platform-python for RHEL 7.
Add environment, compression, and image fields and define the imageFunc function type.
Copied osCustomizations() and liveImage() functions from RHEL 8 and remove unneeded customizations and options.
Moved the Azure image type definition to the top of the file for consistency with the other image type files. Separated the default image config struct from the base image type definition to make it easier to read.
Moved the qcow2 image type definition to the top of the file for consistency with the other image type files. Separated the default image config struct from the base image type definition to make it easier to read.
- Replace Manifest() and PackageSets() imageType methods with (adapted) copies from RHEL 8. - Replace pipeline functions with liveImage image function. - Specify xz compression for Azure RHUI. - Add similar package name overrides as we did in RHEL 8. For RHEL 7, we need to modify the capitalisation of python3-pyyaml.
Add the partition tool as an option on the Raw pipeline. Set it to the old value (sfdisk) by default. Expose the option up through the liveImage image kind so that the distribution can set it if needed. For RHEL 7, set it to sgdisk.
Older OS versions (RHEL 7) with older versions of grub2 don't support BLS entries. Setting NoBLS to true configures the bootloader with traditional menu entries through the grub2.legacy osbuild stage. This requires specifying extra information for the OS to the pipeline: version, product, and nick.
The RHEL 7 vpc subformat in qemu does not support force_size so we need to be able to disable it. The parameter in all parts is defined as a pointer because the default value is 'true'. Not specifying it will keep the option in the osbuild stage as 'nil', falling back to 'true' in osbuild.
The RHEL 7 images need to enable the force_autorelabel option for the SELinux stage in osbuild. This option should almost never be used but it was added specifically for RHEL 7. With the rewrite to the new definitions and the sharing of pipeline code between all distros, we need to add support to all stages of the pipeline generation to be able to enable it.
YUMConfig is supported in ImageConfig for RHEL 7. We now copy the options over to OSCustomizations and create the stage when necessary.
Changes: - Removed unnecessary packages from build roots. Build packages are added on-demand. - Some stages changed order in the OS pipeline for azure-rhui. This will have no functional effect. - RHSM Facts stage added to all RHEL 7 manifests. This wont be used since RHEL 7 is not built in the cloud service. The RHSM fact is added by the test case generator to all image types to test that the option is working properly. - Azure archive pipeline renamed to xz like in all the other rewritten image types that use the xz pipeline. - Azure image filename before archiving has changed from 'disk.vhd' to 'image.vhd'. Again, this will have no functional effect because the name of the final artifact is unchanged (disk.vhd.xz).
achilleas-k
force-pushed
the
rewrite/rhel7
branch
from
f0d8509 to
3af99aa
Compare
|
And a quick rebase on main. |
schutzbot
reviewed
Jan 25, 2023
There was a problem hiding this comment.
Manifest-diff job [0] as manifests.diff.
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.
Followup to #3120 and #3213.
This is a rewrite of the
distro/rhel7/package to use the new image definition framework. I've described and provided context for all changes in individual commit messages.The changeset is much smaller because of the limited number (2) of image types in RHEL 7.
One notable change is the addition of the
force_autorelabeloption in the globalImageConfig. The RHEL 7 images need to enable theforce_autorelabeloption for the SELinux stage in osbuild. This option should almost never be used but it was added specifically for RHEL 7. With the rewrite to the new definitions and the sharing of pipeline code between all distros, we need to add support to all stages of the pipeline generation to be able to enable it.EDIT: We don't test RHEL 7 in CI. I did a build test of all three test manifests without issue to confirm the build root isn't missing any required packages.