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

Port RHEL-7 to the common rhel package #581

Merged
merged 5 commits into from
Apr 15, 2024

Conversation

thozza
Copy link
Member

@thozza thozza commented Apr 11, 2024

Port RHEL-7 as the last distro to the common rhel package.

Notable changes:

  • Add NoBLS to ImageConfig
  • Add Codename() to the distro.Distro interface
  • Pass YUM config from the ImageConfig to OSCustomizations in distro/rhel.
  • Pass SELinuxForceRelabel from the ImageConfig to OSCustomizations in distro/rhel.
  • Add DiskImageVPCForceSize and DiskImagePartTool to rhel.ImageType, since these needs to be set to non-default values for RHEL-7.

I compared all manifests generated on main and HEAD of this PR and there were no changes.

@thozza thozza requested review from achilleas-k and supakeen April 11, 2024 19:13
supakeen
supakeen previously approved these changes Apr 12, 2024
Copy link
Member

@supakeen supakeen left a comment

Choose a reason for hiding this comment

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

Looks very nice just a question to clarify what a nick is :)

pkg/distro/distro.go Outdated Show resolved Hide resolved
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.

I initially thought we might not want this because RHEL 7 is "too different" from 8 and 9 to be merged cleanly but the actual changes here are quite small. That last commit has a large diff but it's all mostly structural changes.

Really nice that this gets unified too. Clean. Thank you!!

LGTM

@achilleas-k
Copy link
Member

Let's hold off merging this until #586 gets through otherwise we'll get a lot of unnecessary builds.

@croissanne croissanne enabled auto-merge April 12, 2024 15:33
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.

Since this isn't critical and we're not in a hurry, I'm marking it with a change request for the Nick -> Codename rename.

thozza added 5 commits April 15, 2024 11:14
This makes the meaning of the field more explicit.

Signed-off-by: Tomáš Hozza <[email protected]>
Previously, the RHEL-7 diskImage() image kind implementation hardcoded
the NoBLS setting. To be able to port RHEL-7 to the common RHEL image
kind implementation, move the NoBLS setting to the default distro
ImageConfig.

Signed-off-by: Tomáš Hozza <[email protected]>
Some distributions use codenames for releases. Add it to the
distro.Distro interface.

Signed-off-by: Tomáš Hozza <[email protected]>
Port RHEL-7 distro to the common rhel package.

Notable changes:
 - Pass YUM config from the ImageConfig to OSCustomizations in
   distro/rhel.
 - Pass SELinuxForceRelabel from the ImageConfig to OSCustomizations in
   distro/rhel.
 - Add DiskImageVPCForceSize and DiskImagePartTool to rhel.ImageType,
   since these needs to be set to non-default values for RHEL-7.

Signed-off-by: Tomáš Hozza <[email protected]>
@croissanne croissanne added this pull request to the merge queue Apr 15, 2024
Merged via the queue into osbuild:main with commit f1ee00c Apr 15, 2024
14 of 16 checks passed
@thozza thozza deleted the rhel-common-el7 branch April 15, 2024 12:03
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