-
-
Notifications
You must be signed in to change notification settings - Fork 143
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
Rework Red Hat resolved package list to be more future proof #468
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd lean to leaving it out of metadata.json
until we can verify it in CI.
Having said that, all the Red Hat family except EL 8 have systemd-resolved
. Perhaps we should set it in data/RedHat-family.yaml
and then set it to ~
in data/RedHat-family-8.yaml
to unset it again. That way we're future proof.
At least, I see that on Fedora 39 & 40 systemd-resolved is a separate package as well that we don't have in Fedora.yaml
right now.
metadata.json
Outdated
@@ -58,7 +58,8 @@ | |||
"operatingsystemrelease": [ | |||
"7", | |||
"8", | |||
"9" | |||
"9", | |||
"10" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps this is a good excuse to start supporting CentOS Stream 10 in our CI for acceptance tests, though I doubt there are Puppet packages available though :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can confirm there is no puppet agent for CS10. I pulled the one from Fedora to test it.
Took a stab at moving the package name up a slot per your comment. I'm not sure how to fix the |
7677990
to
67ff82b
Compare
spec/classes/init_spec.rb
Outdated
@@ -48,7 +48,7 @@ | |||
end | |||
|
|||
case [facts[:os]['family'], facts[:os]['release']['major']] | |||
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12] | |||
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora \d+] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the \d+
doesn't match. Did you try
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora \d+] | |
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora /\d+/] |
But even then, I think %w[a b]
always produces strings, so you'd need to be explicit and say
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora \d+] | |
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora 37], %w[Fedora 38] |
Or maybe
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora \d+] | |
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], ["Fedora", /\d+/] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait, lol, no!
family
is RedHat
for Fedora too. So how about
when %w[RedHat 7], %w[RedHat 9], %w[Debian 12], %w[Fedora \d+] | |
when %w[RedHat 7], ["RedHat", 9..999], %w[Debian 12] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding my brain dump from IRC:
19:19 < Zhenech> ooooh
19:20 < Zhenech> that major not mathing 9..999 is because it's a string, not an int
19:21 < Zhenech> mh, no, even that doesn't help
19:21 < Zhenech> fuckit
19:24 < Zhenech> okay, yeah, it constructs an Array, and that Array, as an object, must match, it can't contain matchers itself
c3251ec
to
c9aa96e
Compare
@jcpunk any chance you can add factsets to https://github.com/voxpupuli/facterdb as soon as CentOS offers vagrant images? That's required for us to properly test it. |
Stream 10 is still gathering shape, vagrant may be a ways off. |
to quote from IRC:
|
https://quay.io/repository/centos/centos?tab=tags has |
https://kojihub.stream.centos.org/koji/packageinfo?packageID=3493 is also probably worth noting here. |
Note our CI relies on Vagrant with Docker as a backend, so containers (which exist) are sufficient for that. |
Our CI uses docker directly, without vagrant (if you're speaking about the vox pupuli module pipeline). But we need Vagrant to generate factsets for facterdb (and that uses the facter ruby gems and doesn't require the puppet rpms). |
Oh yes, I indeed meant Beaker with Docker backend. |
Pull Request (PR) description
CentOS Stream10 continues to have systemd-resolved in its own package.
This Pull Request (PR) fixes the following issues