Skip to content

Commit 71f3d26

Browse files
authored
Merge pull request #1688 from bastelfreak/el10
Add EL10 support
2 parents cb474b0 + 9bbd99e commit 71f3d26

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

metadata.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,39 @@
3939
"operatingsystem": "RedHat",
4040
"operatingsystemrelease": [
4141
"8",
42-
"9"
42+
"9",
43+
"10"
4344
]
4445
},
4546
{
4647
"operatingsystem": "Rocky",
4748
"operatingsystemrelease": [
4849
"8",
49-
"9"
50+
"9",
51+
"10"
5052
]
5153
},
5254
{
5355
"operatingsystem": "AlmaLinux",
5456
"operatingsystemrelease": [
5557
"8",
56-
"9"
58+
"9",
59+
"10"
5760
]
5861
},
5962
{
6063
"operatingsystem": "OracleLinux",
6164
"operatingsystemrelease": [
6265
"8",
63-
"9"
66+
"9",
67+
"10"
6468
]
6569
},
6670
{
6771
"operatingsystem": "CentOS",
6872
"operatingsystemrelease": [
69-
"9"
73+
"9",
74+
"10"
7075
]
7176
},
7277
{

spec/spec_helper_acceptance.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
when 'Debian'
88
install_puppet_module_via_pmt_on(host, 'puppetlabs-apt')
99
when 'RedHat'
10-
# Soft dep on epel for Passenger
11-
install_package(host, 'epel-release')
10+
if fact_on(host, 'os.name') == 'OracleLinux'
11+
ver = fact_on(host, 'os.release.major')
12+
install_package(host, "oracle-epel-release-el#{ver}")
13+
else
14+
# Soft dep on epel for Passenger
15+
install_package(host, 'epel-release')
16+
end
1217
end
1318

1419
# Fake keys.

0 commit comments

Comments
 (0)