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

Add Red Hat Enterprise Linux 9 support #1303

Merged
merged 3 commits into from
Jun 10, 2022
Merged

Conversation

ekohl
Copy link
Collaborator

@ekohl ekohl commented Sep 27, 2021

The comment indicates this is something that needs to be done on EL6 and older. The current check would also trigger on EL9. This uses a version comparison on the major version. We can leave out the Fedora check since we don't need to care about Fedora < 7.

@ekohl ekohl requested a review from a team as a code owner September 27, 2021 11:33
@puppet-community-rangefinder
Copy link

postgresql::server::config is a class

that may have no external impact to Forge modules.

postgresql::server::config_entry is a type

that may have no external impact to Forge modules.

This module is declared in 70 of 578 indexed public Puppetfiles.


These results were generated with Rangefinder, a tool that helps predict the downstream impact of breaking changes to elements used in Puppet modules. You can run this on the command line to get a full report.

Exact matches are those that we can positively identify via namespace and the declaring modules' metadata. Non-namespaced items, such as Puppet 3.x functions, will always be reported as near matches only.

@bastelfreak
Copy link
Collaborator

is that all to get EL 9 support? Because that's currently not listed in the metadata.json.

@ekohl
Copy link
Collaborator Author

ekohl commented Sep 27, 2021

It probably needs more work for real EL9 support. I was going over the places where the OS major version was used and this jumped out. It also needs to set a default PG version in globals.pp.

bastelfreak
bastelfreak previously approved these changes Sep 27, 2021
@ekohl
Copy link
Collaborator Author

ekohl commented Sep 27, 2021

I fixed a versioncmp check and added the default version in globals.pp.

@ekohl ekohl changed the title Properly confine a check to EL < 7 for EL9 support Initial EL9 support Sep 27, 2021
bastelfreak
bastelfreak previously approved these changes Sep 27, 2021
@ekohl
Copy link
Collaborator Author

ekohl commented Sep 27, 2021

I must admit I didn't have an EL9 box at hand to actually test this out. That's why I've labeled it as initial support and didn't add it to metadata.json.

smortex
smortex previously approved these changes Sep 27, 2021
Copy link
Collaborator

@smortex smortex left a comment

Choose a reason for hiding this comment

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

Looks good!

Can't we count on acceptance tests as a base for supporting this OS?

@ekohl
Copy link
Collaborator Author

ekohl commented Sep 28, 2021

Not easily. I started in Beaker but the problem is that you don't have RPMs for EL9 and the EL8 ones don't install. See voxpupuli/beaker-hostgenerator#225 (comment) as well.

@ekohl
Copy link
Collaborator Author

ekohl commented Feb 5, 2022

Looks like CI here doesn't automatically run tests on EL9 if you add it to metadata.

@kajinamit
Copy link
Contributor

I think you should also update manifests/params.pp. Please find the below change I made in another PR.

https://github.com/puppetlabs/puppetlabs-postgresql/pull/1321/files#diff-e78db79abb0b543310767fb9d2814cc4e2408f613de4985186251c70bdd4edbb

@ekohl ekohl force-pushed the el9-fix branch 4 times, most recently from 296915a to 71b5329 Compare February 6, 2022 18:21
@ekohl
Copy link
Collaborator Author

ekohl commented Feb 6, 2022

I've chosen to rely on the service_provider param/fact instead. I'm still not sure how PDK determines how to run tests acceptance tests.

It states:

Warning: Cannot find image for CentOS-9

So I guess we need Puppetlabs to create a CentOS 9 Stream image on their CI.

@github-actions
Copy link

github-actions bot commented May 7, 2022

This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.

@github-actions github-actions bot added the stale label May 7, 2022
@ekohl
Copy link
Collaborator Author

ekohl commented May 7, 2022

I'm still blocked on a question to the Puppet folks for actual testing.

@chelnak chelnak removed the stale label May 7, 2022
@chelnak
Copy link
Contributor

chelnak commented May 7, 2022

I've removed the label for now. This one will have remain on hold until we support the required OS.

ekohl added 2 commits June 1, 2022 15:21
Rather than using static OS definitions, this uses the service_provider
parameter or fact (provided by puppetlabs/stdlib).
@ekohl
Copy link
Collaborator Author

ekohl commented Jun 1, 2022

Rebased to resolve conflicts and added RHEL 9 to metadata.json.

@ekohl
Copy link
Collaborator Author

ekohl commented Jun 8, 2022

@david22swan since you opened #1343, could you take a look a this instead? I'm not sure why EL8 tests timed out.

@david22swan
Copy link
Member

@ekohl Yeh, this look's good, have re-kicked those tests that failed just to be sure but would be happy to merge.
My only request would be that you update the pr title to explicitly state that support for RedHat 9 has been added, so that it stands out for the auto changelog.

@ekohl ekohl changed the title Initial EL9 support Add Red Hat 9 & CentOS Stream 9 support Jun 8, 2022
@ekohl
Copy link
Collaborator Author

ekohl commented Jun 8, 2022

Like this? Should I also update the (last) commit message or is the current one sufficient?

@david22swan
Copy link
Member

david22swan commented Jun 8, 2022

@ekohl Yeh like that, but could you also remove the CentOS Stream 9 from the title and metadata.
Since the puppet agent doesn't support it yet we can't test it yet and so can't claim official support, had missed that you added it to the metadata as well sorry.
We're using the below issue to track when support will be added however if you want to follow it:
https://github.com/puppetlabs/content-and-tooling-team/issues/10

edit: Ah, the commit messages is fine as it is

The comment indicates the checks in server config need to be done on EL6
and older only. The current check would also trigger on EL9. This uses
a version comparison on the major version. We can leave out the Fedora
check since we don't need to care about Fedora < 7.

It also sets the default version on EL9 to version 13. This should also
affect CentOS Stream 9, which is supposed to work but not officially
verified to work.
@ekohl ekohl changed the title Add Red Hat 9 & CentOS Stream 9 support Add Red Hat Enterprise Linux 9 support Jun 9, 2022
@david22swan
Copy link
Member

Not sure what is causing the issue's with the AlmaLinux/Rocky/CentOS 8 tests here but it seems to be consistent.

@ekohl
Copy link
Collaborator Author

ekohl commented Jun 9, 2022

Yes, but they have existed for a long time I think. Perhaps they commonly failed in puppetlabs-apache, but I recall them timing out very often in some module(s).

@david22swan
Copy link
Member

Have rekicked the tests with extra debugging

@david22swan
Copy link
Member

@ekohl
Have tried looking into a cause for this and found none, its replicating on the main branch so gonna go ahead and merge your pr.
Thanks for putting in the work and sorry for the wait.

Copy link
Member

@david22swan david22swan left a comment

Choose a reason for hiding this comment

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

LGTM

@david22swan david22swan merged commit 81ae579 into puppetlabs:main Jun 10, 2022
@ekohl ekohl deleted the el9-fix branch June 10, 2022 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants