(MODULES-11739) Add RHEL 10 support#2629
Open
SugatD wants to merge 5 commits into
Open
Conversation
SugatD
requested review from
a team,
bastelfreak,
ekohl and
smortex
as code owners
Add RHEL 10 to the supported operating systems in metadata.json so modules consuming puppetlabs-apache can declare RHEL 10 support and litmus generates a RHEL 10 platform in the test matrix (see puppetlabs/puppet_litmus#621). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
SugatD
force-pushed
the
MODULES-11739-rhel-10-support
branch
from
0015cf6 to
7acbed5
Compare
puppet/epel 5.0.0 (pinned to dodge a file() function regression in
newer 5.x releases) ships RPM-GPG-KEY-EPEL-{7,8,9} but not
RPM-GPG-KEY-EPEL-10, so `include epel` in setup_acceptance_node.pp
fails on RHEL 10 with:
Could not find any files from epel/RPM-GPG-KEY-EPEL-10
(modules/epel/manifests/init.pp, line: 303)
EPEL-10 support landed in puppet/epel 6.0.0 (voxpupuli/puppet-epel#173).
Bump only the RHEL 10 path to 6.0.0; keep 5.0.0 for older RedHat /
Oracle releases so the existing file() workaround stays in effect.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
RHEL 10 base repos no longer ship `httpd-itk`, `mod_php`, or
`mod_security` / `mod_security_crs`, so the corresponding acceptance
tests fail when trying to install those packages on a RHEL 10 node.
Add `RedHat: 10` to the `@note Unsupported platforms` tag on each
class so that ApacheModPlatformCompatibility (util/apache_mod_platform_support.rb)
filters the relevant specs out on RHEL 10 via the existing
`mod_supported_on_platform?` mechanism, mirroring how `RedHat: 9`
already skips `mod_php` and how `RedHat: 8, 9` skip `mod_itk`.
This also auto-skips the `vhost_spec.rb` "parameter tests" block,
which is already gated on `mod_supported_on_platform?('apache::mod::itk')`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
SugatD
force-pushed
the
MODULES-11739-rhel-10-support
branch
from
7acbed5 to
f1d6df9
Compare
So apache::mod::php fails cleanly on RHEL 10 via the existing guard instead of attempting a nonexistent PHP 5 package install, matching the @note and the RHEL 9 precedent. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
RedHat10tooperatingsystem_supportinmetadata.jsonso puppetlabs-apache declares RHEL 10 support.epel6.x on RHEL 10 acceptance nodes (spec/spec_helper_acceptance_local.rb) since earlier EPEL releases do not ship for RHEL 10.apache::mod::itk,apache::mod::php, andapache::mod::securityas unsupported on RHEL 10 — the underlying packages are not shipped by RHEL 10 base repos.Notes on dependencies (now satisfied upstream, no Gemfile/metadata change needed in this PR):
puppetlabs/concatwidening to< 11.0.0landed onmainvia puppetlabs/concat: Allow 10.x #2630; this branch was rebased on top of it.puppet_litmusRHEL 10 support landed via (PA-8527) Add RHEL-10 support to provision_service matrix puppet_litmus#621 and is available in the released gem, so the temporary git pin previously included in this PR has been dropped.Jira: MODULES-11739
Test plan
Specjob passes.Acceptancejob generates a matrix that includesRedHat-10(andRedHat-10-arm) and provisions the node via puppet_litmus's provision_service.mod_security/mod_security_crsandmod_php) are expected to fail on RHEL 10 and will be addressed in follow-up tickets.🤖 Generated with Claude Code