simp-rspec-puppet-facts 3.13.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +121 -7
  3. data/facts/3.6/amazon-2-x86_64.facts +6 -6
  4. data/facts/5.1/almalinux-10-x86_64.facts +1437 -0
  5. data/facts/5.1/almalinux-8-x86_64.facts +1551 -0
  6. data/facts/5.1/almalinux-9-x86_64.facts +1600 -0
  7. data/facts/5.1/amazon-2-x86_64.facts +1432 -0
  8. data/facts/5.1/centos-10-x86_64.facts +1396 -0
  9. data/facts/5.1/centos-9-x86_64.facts +1537 -0
  10. data/facts/5.1/oraclelinux-10-x86_64.facts +1419 -0
  11. data/facts/5.1/oraclelinux-8-x86_64.facts +1545 -0
  12. data/facts/5.1/oraclelinux-9-x86_64.facts +1604 -0
  13. data/facts/5.1/redhat-10-x86_64.facts +1439 -0
  14. data/facts/5.1/redhat-8-x86_64.facts +1453 -0
  15. data/facts/5.1/redhat-9-x86_64.facts +1505 -0
  16. data/facts/5.1/rocky-10-x86_64.facts +1348 -0
  17. data/facts/5.1/rocky-8-x86_64.facts +1453 -0
  18. data/facts/5.1/rocky-9-x86_64.facts +1620 -0
  19. data/facts/5.1/windows-2016-x64.facts +525 -0
  20. data/facts/5.1/windows-2019-x64.facts +529 -0
  21. data/facts/5.1/windows-2022-x64.facts +531 -0
  22. data/facts/5.1/windows-2025-x64.facts +527 -0
  23. data/facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml +1 -1
  24. data/facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml +1 -1
  25. data/facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml +1 -1
  26. data/facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml +1 -1
  27. data/facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml +1 -1
  28. data/facts/scripts/gce_scrub_data.rb +15 -15
  29. data/facts/scripts/get_facts.rb +3 -3
  30. data/lib/simp/rspec-puppet-facts.rb +84 -67
  31. data/lib/simp/version.rb +3 -1
  32. data/spec/acceptance/nodesets/{centos7.yml → almalinux10.yml} +5 -7
  33. data/spec/acceptance/nodesets/almalinux8.yml +1 -1
  34. data/spec/acceptance/nodesets/almalinux9.yml +1 -1
  35. data/spec/acceptance/nodesets/{centos8.yml → centos10.yml} +5 -7
  36. data/spec/acceptance/nodesets/centos9.yml +2 -2
  37. data/spec/acceptance/nodesets/oel10.yml +16 -0
  38. data/spec/acceptance/nodesets/oel8.yml +6 -13
  39. data/spec/acceptance/nodesets/oel9.yml +3 -2
  40. data/spec/acceptance/nodesets/{rhel7.yml → rhel10.yml} +5 -5
  41. data/spec/acceptance/nodesets/rhel8.yml +1 -1
  42. data/spec/acceptance/nodesets/rhel9.yml +1 -1
  43. data/spec/acceptance/nodesets/rocky10.yml +18 -0
  44. data/spec/acceptance/nodesets/rocky8.yml +2 -2
  45. data/spec/acceptance/nodesets/rocky9.yml +2 -2
  46. data/spec/acceptance/nodesets/win_2016.yml +1 -1
  47. data/spec/acceptance/nodesets/win_2019.yml +1 -1
  48. data/spec/acceptance/nodesets/win_2022.yml +1 -1
  49. data/spec/acceptance/nodesets/win_2025.yml +30 -0
  50. data/spec/acceptance/suites/default/00_default_spec.rb +21 -19
  51. data/spec/fixtures/metadata.json +6 -23
  52. data/spec/spec_helper_acceptance.rb +9 -52
  53. data/spec/unit/data_normalization_spec.rb +35 -0
  54. data/spec/unit/simp_rspec_puppet_facts_spec.rb +206 -0
  55. metadata +276 -236
  56. data/facts/Gemfile +0 -11
  57. data/facts/Vagrantfile +0 -236
  58. data/spec/acceptance/nodesets/centos7-vault.sh +0 -6
  59. data/spec/acceptance/nodesets/centos8-vault.sh +0 -8
  60. data/spec/acceptance/nodesets/oel7.yml +0 -23
  61. data/spec/data_normalization_spec.rb +0 -34
  62. data/spec/fixtures/metadata.json_with_missing_operatingsystem_support +0 -25
  63. data/spec/simp_rspec_puppet_facts_spec.rb +0 -198
@@ -1,26 +1,29 @@
1
+ # Simp namespace
1
2
  module Simp; end
3
+
4
+ # Simp::RspecPuppetFacts namespace
2
5
  module Simp::RspecPuppetFacts
3
6
  require 'json'
4
7
  require 'puppet'
5
8
 
6
9
  require File.expand_path('version', File.dirname(__FILE__))
7
10
 
8
- SELINUX_MODES = [:enforcing, :disabled, :permissive]
11
+ SELINUX_MODES = [:enforcing, :disabled, :permissive].freeze
9
12
 
10
- def supported_os_strings( opts, known_os_list=[] )
13
+ def supported_os_strings(opts, known_os_list = [])
11
14
  supported_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os)
12
15
  hardwaremodels = opts.fetch(:hardwaremodels, ['x86_64'])
13
16
  os_strings = []
14
17
  supported_os.each do |os|
15
- os_name = os['operatingsystem'].downcase.gsub(/\s/,'_')
18
+ os_name = os['operatingsystem'].downcase.gsub(%r{\s}, '_')
16
19
 
17
20
  os['operatingsystemrelease'] ||= []
18
21
  if os['operatingsystemrelease'].empty?
19
22
  # Just pick the latest one
20
23
  os_strings.push(
21
24
  known_os_list
22
- .select{|x| x.start_with?(os_name)}
23
- .sort.last
25
+ .select { |x| x.start_with?(os_name) }
26
+ .sort.last,
24
27
  )
25
28
  else
26
29
  os['operatingsystemrelease'].each do |rel|
@@ -36,7 +39,7 @@ module Simp::RspecPuppetFacts
36
39
 
37
40
  # Don't ask rspec-puppet-facts for operatingsystems we've already recorded
38
41
  # because if it doesn't have them it will crash
39
- def filter_opts( opts, simp_h )
42
+ def filter_opts(opts, simp_h)
40
43
  rfh_hw = opts.fetch(:hardwaremodels, ['x86_64'])
41
44
  rfh_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os).dup
42
45
 
@@ -45,9 +48,9 @@ module Simp::RspecPuppetFacts
45
48
  os['operatingsystemrelease'] ||= []
46
49
  if os['operatingsystemrelease'].empty?
47
50
  os_release = simp_h.keys
48
- .select{|x| x.start_with?(os['operatingsystem'].downcase) }
49
- .sort
50
- .last
51
+ .select { |x| x.start_with?(os['operatingsystem'].downcase) }
52
+ .sort
53
+ .last
51
54
 
52
55
  os['operatingsystemrelease'] = [os_release.split('-')[1]] if os_release
53
56
  end
@@ -66,88 +69,84 @@ module Simp::RspecPuppetFacts
66
69
  ret_opts
67
70
  end
68
71
 
69
- def on_supported_os( opts = {} )
70
- opts[:simp_fact_dir_path] ||= File.expand_path("../../facts/", File.dirname(__FILE__))
72
+ def on_supported_os(opts = {})
73
+ opts[:simp_fact_dir_path] ||= File.expand_path('../../facts/', File.dirname(__FILE__))
71
74
 
72
75
  simp_h = load_facts(opts[:simp_fact_dir_path])
73
76
 
74
77
  masked_opts = filter_opts(opts, simp_h)
78
+ Simp::RspecPuppetFacts::Shim.on_supported_os(masked_opts) unless masked_opts[:supported_os]&.empty?
75
79
 
76
- rfh_h = {}
77
- rfh_h = Simp::RspecPuppetFacts::Shim.on_supported_os(masked_opts) unless masked_opts[:supported_os]&.empty?
78
-
79
- #merged_os_hash = rfh_h.merge(simp_h) # we should NOT merge default facterdb factsets
80
+ # merged_os_hash = rfh_h.merge(simp_h) # we should NOT merge default facterdb factsets
80
81
  merged_os_hash = simp_h
81
- h = merged_os_hash.select{|k,v| supported_os_strings(opts, merged_os_hash.keys).include? k}
82
+ h = merged_os_hash.slice(*supported_os_strings(opts, merged_os_hash.keys))
82
83
 
83
- h.each do | os, facts |
84
- facter_ver=Facter.version.split('.')[0..1].join('.')
84
+ h.each do |os, facts|
85
+ facter_ver = Facter.version.split('.')[0..1].join('.')
85
86
  facts_file = File.expand_path("../../facts/#{facter_ver}/#{os}.facts",
86
87
  File.dirname(__FILE__))
87
88
  if File.file? facts_file
88
89
  captured_facts_raw = File.open(
89
90
  File.expand_path("../../facts/#{facter_ver}/#{os}.facts",
90
- File.dirname(__FILE__))
91
+ File.dirname(__FILE__)),
91
92
  ).read
92
- captured_facts = symbolize_keys JSON.parse( captured_facts_raw )
93
- captured_facts.keep_if{ |k,v| (captured_facts.keys-facts.keys).include? k }
93
+ captured_facts = symbolize_keys JSON.parse(captured_facts_raw)
94
+ captured_facts.keep_if { |k, _v| (captured_facts.keys - facts.keys).include? k }
94
95
 
95
96
  facts.merge! captured_facts
96
- facts.merge! opts.fetch( :extra_facts, {} )
97
- facts.merge!({ :puppetversion => ::Puppet.version })
98
- facts.merge! lsb_facts( facts )
99
- facts.merge! selinux_facts( opts[:selinux_mode], facts )
100
- facts.merge! opts.fetch( :extra_facts_immutable, {} )
97
+ facts.merge! opts.fetch(:extra_facts, {})
98
+ facts[:puppetversion] = ::Puppet.version
99
+ facts.merge! lsb_facts(facts)
100
+ facts.merge! selinux_facts(opts[:selinux_mode], facts)
101
+ facts.merge! opts.fetch(:extra_facts_immutable, {})
101
102
  end
102
103
 
103
- if ( ENV['SIMP_FACTS_OS'] &&
104
- !ENV['SIMP_FACTS_OS'].to_s.strip.empty? &&
105
- ENV['SIMP_FACTS_OS'] !~ /all/i )
106
- unless ENV['SIMP_FACTS_OS'].strip.split(/[ ,]+/).any?{|str| os == str || os.match?(%r[#{str}]) }
107
- h.delete(os)
108
- end
104
+ next unless ENV['SIMP_FACTS_OS'] &&
105
+ !ENV['SIMP_FACTS_OS'].to_s.strip.empty? &&
106
+ ENV['SIMP_FACTS_OS'] !~ %r{all}i
107
+ unless ENV['SIMP_FACTS_OS'].strip.split(%r{[ ,]+}).any? { |str| os == str || os.match?(%r{#{str}}) }
108
+ h.delete(os)
109
109
  end
110
110
  end
111
111
 
112
112
  h
113
113
  end
114
114
 
115
- def lsb_facts( facts )
115
+ def lsb_facts(facts)
116
116
  return facts unless facts[:kernel].casecmp('linux')
117
117
 
118
118
  lsb_facts = {}
119
119
  # attempt to massage a major release version if missing (for facter 1.6)
120
120
  unless ENV['SIMP_FACTS_lsb'] == 'no'
121
- puts "==== mocking lsb facts [disable with SIMP_FACTS_lsb=no]" if ENV['VERBOSE']
121
+ puts '==== mocking lsb facts [disable with SIMP_FACTS_lsb=no]' if ENV['VERBOSE']
122
122
  lsb_facts[:lsbmajdistrelease] = facts[:os][:release][:major]
123
123
  end
124
124
  lsb_facts
125
125
  end
126
126
 
127
- def selinux_facts( mode=:enforcing, facts )
127
+ def selinux_facts(mode = :enforcing, facts) # rubocop:disable Style/OptionalArguments
128
128
  return facts if facts[:kernel]&.casecmp('windows')
129
129
 
130
- unless SELINUX_MODES.include?( mode )
131
- fail "FATAL: `mode` must be one of: #{SELINUX_MODES.map{|x| x.to_s.sub(/^/,':')}.join(', ')}"
130
+ unless SELINUX_MODES.include?(mode)
131
+ raise "FATAL: `mode` must be one of: #{SELINUX_MODES.map { |x| x.to_s.sub(%r{^}, ':') }.join(', ')}"
132
132
  end
133
- sefacts = {}
134
133
  sefacts_enforcing = {
135
- :selinux => true,
136
- :selinux_enforced => true,
137
- :selinux_current_mode => 'enforcing',
138
- :selinux_state => 'enforcing',
134
+ selinux: true,
135
+ selinux_enforced: true,
136
+ selinux_current_mode: 'enforcing',
137
+ selinux_state: 'enforcing',
139
138
  }
140
139
  sefacts_permissive = {
141
- :selinux => true,
142
- :selinux_enforced => false,
143
- :selinux_current_mode => 'permissive',
144
- :selinux_state => 'permssive',
140
+ selinux: true,
141
+ selinux_enforced: false,
142
+ selinux_current_mode: 'permissive',
143
+ selinux_state: 'permssive',
145
144
  }
146
145
  sefacts_disabled = {
147
- :selinux => false,
148
- :selinux_enforced => false,
149
- :selinux_current_mode => 'disabled',
150
- :selinux_state => 'disabled',
146
+ selinux: false,
147
+ selinux_enforced: false,
148
+ selinux_current_mode: 'disabled',
149
+ selinux_state: 'disabled',
151
150
  }
152
151
  sefacts = sefacts_enforcing
153
152
  sefacts = sefacts_enforcing if mode == :enforcing
@@ -155,13 +154,13 @@ module Simp::RspecPuppetFacts
155
154
  sefacts = sefacts_disabled if mode == :disabled
156
155
 
157
156
  # ensure mount options in :tmp_mount_* facts match
158
- ['tmp','var_tmp','dev_shm'].each do |m|
157
+ ['tmp', 'var_tmp', 'dev_shm'].each do |m|
159
158
  k = "tmp_mount_#{m}".to_sym
160
- if mount_opts = facts.fetch(k,false)
159
+ if (mount_opts = facts.fetch(k, false))
161
160
  if mode == :disabled
162
- sefacts[k] = mount_opts.sub(/,seclabel$|seclabel,/, '')
161
+ sefacts[k] = mount_opts.sub(%r{,seclabel$|seclabel,}, '')
163
162
  else
164
- unless mount_opts =~ /\bseclabel\b/
163
+ unless %r{\bseclabel\b}.match?(mount_opts)
165
164
  sefacts[k] = "#{mount_opts},seclabel"
166
165
  end
167
166
  end
@@ -172,7 +171,7 @@ module Simp::RspecPuppetFacts
172
171
 
173
172
  # recursively onvert all hash keys to symbols
174
173
  def symbolize_keys(hash)
175
- hash.inject({}){|result, (key, value)|
174
+ hash.each_with_object({}) do |(key, value), result|
176
175
  new_key = case key
177
176
  when String then key.to_sym
178
177
  else key
@@ -182,36 +181,54 @@ module Simp::RspecPuppetFacts
182
181
  else value
183
182
  end
184
183
  result[new_key] = new_value
185
- result
186
- }
184
+ end
187
185
  end
188
186
 
189
-
190
- def load_facts( fact_dir_path )
187
+ def load_facts(fact_dir_path)
191
188
  facter_xy_version = Facter.version.split('.')[0..1].join('.')
192
- fact_dir = File.join(fact_dir_path,facter_xy_version)
189
+ fact_dir = File.join(fact_dir_path, facter_xy_version)
193
190
 
194
191
  unless File.exist? fact_dir
195
- _msg = "Can't find SIMP facts for Facter #{facter_xy_version}, skipping...
192
+ # Try to fall back to the highest available older version
193
+ available_versions = Dir.glob(File.join(fact_dir_path, '*'))
194
+ .select { |d| File.directory?(d) }
195
+ .map { |d| File.basename(d) }
196
+ .select { |v| v.match?(%r{^\d+\.\d+$}) }
197
+ .sort_by { |v| Gem::Version.new(v) }
198
+ .reverse
199
+
200
+ fallback_version = available_versions.find do |v|
201
+ Gem::Version.new(v) < Gem::Version.new(facter_xy_version)
202
+ end
196
203
 
197
- HINT: If this version of Facter has been released recently, try running
204
+ if fallback_version
205
+ fact_dir = File.join(fact_dir_path, fallback_version)
206
+ warn "WARNING: Using fallback facts for Facter #{fallback_version} (requested #{facter_xy_version})"
207
+ else
208
+ msg = <<~END_MSG
209
+ Can't find SIMP facts for Facter #{facter_xy_version}, skipping...
198
210
 
199
- `FACTER_GEM_VERSION='~> X.Y.0' bundler update facter
211
+ HINT: If this version of Facter has been released recently, try running
200
212
 
201
- Where 'X.Y' is the version of the last facter that worked"
202
- fail(_msg)
213
+ `FACTER_GEM_VERSION='~> X.Y.0' bundler update facter
214
+
215
+ Where 'X.Y' is the version of the last facter that worked
216
+ END_MSG
217
+ raise(msg)
218
+ end
203
219
  end
204
220
 
205
221
  simp_h = {}
206
- fact_files = Dir.glob( File.join(fact_dir, '*.facts') ).sort
222
+ fact_files = Dir.glob(File.join(fact_dir, '*.facts')).sort
207
223
  fact_files.each do |file|
208
- key = File.basename(file).sub(/\.facts$/,'')
224
+ key = File.basename(file).sub(%r{\.facts$}, '')
209
225
  data = JSON.parse(File.read(file))
210
226
  simp_h[key] = symbolize_keys(data)
211
227
  end
212
228
  simp_h
213
229
  end
214
230
 
231
+ # Shim to rspec-puppet-facts methods
215
232
  class Shim
216
233
  require 'rspec-puppet-facts'
217
234
  extend ::RspecPuppetFacts
data/lib/simp/version.rb CHANGED
@@ -1,4 +1,6 @@
1
+ # Simp namespace
1
2
  module Simp; end
3
+
2
4
  module Simp::RspecPuppetFacts
3
- VERSION = '3.13.0'
5
+ VERSION = '4.0.0'.freeze
4
6
  end
@@ -1,19 +1,17 @@
1
1
  ---
2
2
  HOSTS:
3
- el7.beaker.test:
3
+ el10.beaker.test:
4
4
  roles:
5
5
  - linux
6
6
  - default
7
- platform: el-7-x86_64
8
- box: generic/centos7
7
+ platform: el-10-x86_64
8
+ box: almalinux/10
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
- family: centos-cloud/centos-7
11
+ family: almalinux-cloud/almalinux-10
12
12
  gce_machine_type: n1-standard-2
13
- shell_provisioner:
14
- path: "<%= File.expand_path(__dir__) %>/spec/acceptance/nodesets/centos7-vault.sh"
15
13
  CONFIG:
16
14
  validate: false
17
15
  log_level: verbose
18
16
  type: aio
19
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -14,4 +14,4 @@ CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -14,4 +14,4 @@ CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -1,19 +1,17 @@
1
1
  ---
2
2
  HOSTS:
3
- el8.beaker.test:
3
+ el10.beaker.test:
4
4
  roles:
5
5
  - linux
6
6
  - default
7
- platform: el-8-x86_64
8
- box: generic/centos8s
7
+ platform: el-10-x86_64
8
+ box: centos/stream10
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
- family: centos-cloud/centos-stream-8
11
+ family: centos-cloud/centos-stream-10
12
12
  gce_machine_type: n1-standard-2
13
- shell_provisioner:
14
- path: "<%= File.expand_path(__dir__) %>/spec/acceptance/nodesets/centos8-vault.sh"
15
13
  CONFIG:
16
14
  validate: false
17
15
  log_level: verbose
18
16
  type: aio
19
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -5,7 +5,7 @@ HOSTS:
5
5
  - linux
6
6
  - default
7
7
  platform: el-9-x86_64
8
- box: generic/centos9s
8
+ box: centos/stream9
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
11
  family: centos-cloud/centos-stream-9
@@ -14,4 +14,4 @@ CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -0,0 +1,16 @@
1
+ ---
2
+ HOSTS:
3
+ oel10:
4
+ roles:
5
+ - linux
6
+ - default
7
+ platform: el-10-x86_64
8
+ box: oraclelinux/10
9
+ box_url: https://oracle.github.io/vagrant-projects/boxes/oraclelinux/10.json
10
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
11
+ vagrant_memsize: 2048
12
+
13
+ CONFIG:
14
+ log_level: verbose
15
+ type: aio
16
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -1,23 +1,16 @@
1
- <%
2
- if ENV['BEAKER_HYPERVISOR']
3
- hypervisor = ENV['BEAKER_HYPERVISOR']
4
- else
5
- hypervisor = 'vagrant'
6
- end
7
- -%>
1
+ ---
8
2
  HOSTS:
9
3
  oel8:
10
4
  roles:
11
5
  - linux
12
6
  - default
13
- platform: el-8-x86_64
14
- box: generic/oracle8
15
- hypervisor: <%= hypervisor %>
7
+ platform: el-8-x86_64
8
+ box: oraclelinux/8
9
+ box_url: https://oracle.github.io/vagrant-projects/boxes/oraclelinux/8.json
10
+ hypervisor: <%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>
16
11
  vagrant_memsize: 2048
17
12
 
18
13
  CONFIG:
19
14
  log_level: verbose
20
15
  type: aio
21
- <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
22
- puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
23
- <% end -%>
16
+ puppet_collection: <%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>
@@ -5,11 +5,12 @@ HOSTS:
5
5
  - linux
6
6
  - default
7
7
  platform: el-9-x86_64
8
- box: generic/oracle9
8
+ box: oraclelinux/9
9
+ box_url: https://oracle.github.io/vagrant-projects/boxes/oraclelinux/9.json
9
10
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
11
  vagrant_memsize: 2048
11
12
 
12
13
  CONFIG:
13
14
  log_level: verbose
14
15
  type: aio
15
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
16
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -1,17 +1,17 @@
1
1
  ---
2
2
  HOSTS:
3
- rhel7:
3
+ rhel10:
4
4
  roles:
5
5
  - linux
6
6
  - default
7
- platform: el-7-x86_64
8
- box: generic/rhel7
7
+ platform: el-10-x86_64
8
+ box: generic/rhel10
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
- family: rhel-cloud/rhel-7
11
+ family: rhel-cloud/rhel-10
12
12
  gce_machine_type: n1-standard-2
13
13
  CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -14,4 +14,4 @@ CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -14,4 +14,4 @@ CONFIG:
14
14
  validate: false
15
15
  log_level: verbose
16
16
  type: aio
17
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
17
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -0,0 +1,18 @@
1
+ ---
2
+ HOSTS:
3
+ el10:
4
+ roles:
5
+ - linux
6
+ - default
7
+ platform: el-10-x86_64
8
+ box: rockylinux/10
9
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
+ vagrant_memsize: 2048
11
+ synced_folder: disabled
12
+ family: rocky-linux-cloud/rocky-linux-10
13
+ gce_machine_type: n1-standard-2
14
+ CONFIG:
15
+ validate: false
16
+ log_level: verbose
17
+ type: aio
18
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -5,7 +5,7 @@ HOSTS:
5
5
  - linux
6
6
  - default
7
7
  platform: el-8-x86_64
8
- box: generic/rocky8
8
+ box: rockylinux/8
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
11
  synced_folder: disabled
@@ -15,4 +15,4 @@ CONFIG:
15
15
  validate: false
16
16
  log_level: verbose
17
17
  type: aio
18
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
18
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -5,7 +5,7 @@ HOSTS:
5
5
  - linux
6
6
  - default
7
7
  platform: el-9-x86_64
8
- box: generic/rocky9
8
+ box: rockylinux/9
9
9
  hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
10
10
  vagrant_memsize: 2048
11
11
  synced_folder: disabled
@@ -15,4 +15,4 @@ CONFIG:
15
15
  validate: false
16
16
  log_level: verbose
17
17
  type: aio
18
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
18
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -27,4 +27,4 @@ CONFIG:
27
27
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
28
28
  hmac:
29
29
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
30
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
30
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -27,4 +27,4 @@ CONFIG:
27
27
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
28
28
  hmac:
29
29
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
30
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
30
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -27,4 +27,4 @@ CONFIG:
27
27
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
28
28
  hmac:
29
29
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
30
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
30
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -0,0 +1,30 @@
1
+ ---
2
+ HOSTS:
3
+ win:
4
+ roles:
5
+ - windows
6
+ platform: windows-server-amd64
7
+ box: gusztavvargadr/windows-server-2025-standard
8
+ hypervisor: "<%= ENV.fetch('BEAKER_HYPERVISOR', 'vagrant') %>"
9
+ vagrant_memsize: 2048
10
+ vagrant_cpus: 2
11
+ user: vagrant
12
+ communicator: winrm
13
+ is_cygwin: false
14
+ family: windows-cloud/windows-2025
15
+ gce_machine_type: n1-standard-2
16
+ CONFIG:
17
+ log_level: verbose
18
+ type: aio
19
+ ssh:
20
+ keepalive: true
21
+ keepalive_interval: 10
22
+ host_key:
23
+ - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
24
+ kex:
25
+ - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
26
+ encryption:
27
+ - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
28
+ hmac:
29
+ - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
30
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"