Skip to content

Commit a089cab

Browse files
committed
Add support for el10
Includes version bump of puppet/epel requirement as their support of el10 landed in 6.0.0. Stops syncing spec_helper_acceptance.rb to permit installing gnupg2 before testing on el10.
1 parent 24aeabd commit a089cab

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

.sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
spec/spec_helper_acceptance.rb:
3-
unmanaged: false
3+
unmanaged: true
44
.puppet-lint.rc:
55
enabled_lint_checks:
66
- parameter_types

data/os/RedHat/10.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
python::default_system_version: "3.12"

metadata.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
"operatingsystem": "AlmaLinux",
2525
"operatingsystemrelease": [
2626
"8",
27-
"9"
27+
"9",
28+
"10"
2829
]
2930
},
3031
{
3132
"operatingsystem": "CentOS",
3233
"operatingsystemrelease": [
33-
"9"
34+
"9",
35+
"10"
3436
]
3537
},
3638
{
@@ -62,21 +64,24 @@
6264
"operatingsystem": "OracleLinux",
6365
"operatingsystemrelease": [
6466
"8",
65-
"9"
67+
"9",
68+
"10"
6669
]
6770
},
6871
{
6972
"operatingsystem": "RedHat",
7073
"operatingsystemrelease": [
7174
"8",
72-
"9"
75+
"9",
76+
"10"
7377
]
7478
},
7579
{
7680
"operatingsystem": "Rocky",
7781
"operatingsystemrelease": [
7882
"8",
79-
"9"
83+
"9",
84+
"10"
8085
]
8186
},
8287
{
@@ -102,7 +107,7 @@
102107
},
103108
{
104109
"name": "puppet/epel",
105-
"version_requirement": ">= 3.0.0 < 6.0.0"
110+
"version_requirement": ">= 6.0.0 < 7.0.0"
106111
}
107112
]
108113
}

spec/spec_helper_acceptance.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# frozen_string_literal: true
22

3-
# Managed by modulesync - DO NOT EDIT
4-
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
5-
63
require 'voxpupuli/acceptance/spec_helper_acceptance'
74

8-
configure_beaker(modules: :metadata)
5+
configure_beaker(modules: :metadata) do |host|
6+
host.install_package('gnupg2') if fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 10
7+
end
98

109
Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

0 commit comments

Comments
 (0)