Skip to content

Commit b234dda

Browse files
committed
Add support for OracleLinux/AlmaLinux/Rocky 9
1 parent b9e2781 commit b234dda

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

metadata.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,24 @@
5555
"9"
5656
]
5757
},
58+
{
59+
"operatingsystem": "OracleLinux",
60+
"operatingsystemrelease": [
61+
"9"
62+
]
63+
},
64+
{
65+
"operatingsystem": "AlmaLinux",
66+
"operatingsystemrelease": [
67+
"9"
68+
]
69+
},
70+
{
71+
"operatingsystem": "Rocky",
72+
"operatingsystemrelease": [
73+
"9"
74+
]
75+
},
5876
{
5977
"operatingsystem": "Scientific",
6078
"operatingsystemrelease": [

spec/classes/puppet_agent_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
9696
case os
97-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
97+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux|oraclelinux|almalinux|rocky)-/
9898
it do
9999
is_expected.to contain_service('puppet-run.timer')
100100
.with_ensure(false)
@@ -171,7 +171,7 @@
171171
case os
172172
when /\A(windows|archlinux)/
173173
it { is_expected.to raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/) }
174-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles)-/
174+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|oraclelinux|almalinux|rocky)-/
175175
it { is_expected.to compile.with_all_deps }
176176
it { is_expected.to contain_concat__fragment('puppet.conf_agent') }
177177
it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
@@ -219,7 +219,7 @@
219219
case os
220220
when /\A(windows|archlinux)/
221221
it { is_expected.to raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/) }
222-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles)-/
222+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|oraclelinux|almalinux|rocky)-/
223223
it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(true) }
224224
it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
225225
it do
@@ -260,7 +260,7 @@
260260
end
261261

262262
case os
263-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
263+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux|oraclelinux|almalinux|rocky)-/
264264
it { is_expected.to compile.with_all_deps }
265265
it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
266266
it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
@@ -303,7 +303,7 @@
303303
end
304304

305305
case os
306-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
306+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux|oraclelinux|almalinux|rocky)-/
307307
it { is_expected.to compile.with_all_deps }
308308
it { is_expected.to contain_class('puppet::agent::service::daemon').with_enabled(false) }
309309
it { is_expected.to contain_class('puppet::agent::service::cron').with_enabled(false) }
@@ -351,7 +351,7 @@
351351
it { is_expected.to contain_class('puppet::agent::service::systemd').with_enabled(false) }
352352

353353
case os
354-
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux)-/
354+
when /\A(debian|redhat|centos|scientific|fedora|ubuntu|sles|archlinux|oraclelinux|almalinux|rocky)-/
355355
it { is_expected.to contain_service('puppet-run.timer').with_ensure(false) }
356356
else
357357
it { is_expected.not_to contain_service('puppet-run.timer') }

0 commit comments

Comments
 (0)