simp-beaker-helpers 2.0.0 → 2.0.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0304973efb22b32c35c856d1a7cc843903b1350f82b7a387e22276a2c5ffa356'
4
- data.tar.gz: '032321468bf13f23a2609749a1e5ff78dc35121c3176da11e6523b8d436ac365'
3
+ metadata.gz: 20611993c0b38c821da287d01266302a5de462fce9dc91005f249675da5e0454
4
+ data.tar.gz: c069784a8d04644b1bf52c476b57cbb4d0432774ae87dabef8167387fd51bc08
5
5
  SHA512:
6
- metadata.gz: 487ac857f0d31c12f23c11f49b2384c5d0147b8d81cb7f0733c2f3eb03977b4642e20301539818152a3535b455cf387bdca2b3ce4ff0281ec5ab1e3fed6f4c3e
7
- data.tar.gz: ec09910f7db78b651a59fad51b36e5dc2db1ca156f23168cf1b9ea533d9a1f49993b13ebbda3a8d5c3b0043cac5ec27cc36b0face9abef3e203230db14eba516
6
+ metadata.gz: 6ce1b8cdd761a7893576d97403e0b6860fb626528f0fc6c64aad17c06029225f764b31f9648f4c60d7b0de96fde63e16cf8f2b5261e9ac2c9d05801919f13609
7
+ data.tar.gz: 99d9c3085ee58c56f8650bdd0708d81fdb2fc128f3d114afd31883533b058345edeadb46307b537341b294cf7a317d5ef3484d7b073f95726b918b850ae1a6cc
@@ -15,7 +15,7 @@ jobs:
15
15
  name: Add issue to project
16
16
  runs-on: ubuntu-latest
17
17
  steps:
18
- - uses: actions/add-to-project@v0.5.0
18
+ - uses: actions/add-to-project@v1.0.2
19
19
  with:
20
20
  project-url: https://github.com/orgs/simp/projects/11
21
21
  github-token: ${{ secrets.AUTO_TRIAGE_TOKEN }}
@@ -1,6 +1,7 @@
1
1
  # Run all tests as GitHub Actions
2
+ ---
2
3
  name: Acceptance Tests
3
- on:
4
+ 'on':
4
5
  push:
5
6
  branches:
6
7
  # A test branch for seeing if your tests will pass in your personal fork
@@ -10,7 +11,7 @@ on:
10
11
 
11
12
  jobs:
12
13
  acceptance:
13
- name: '${{matrix.beaker.suite}}, Puppet ${{matrix.puppet.puppet_version}}'
14
+ name: '${{matrix.beaker.suite}}, ${{matrix.puppet.label}}'
14
15
  runs-on:
15
16
  - ubuntu-latest
16
17
  strategy:
@@ -24,6 +25,11 @@ jobs:
24
25
  puppet_version: '~> 8.0'
25
26
  ruby_version: '3.2'
26
27
  experimental: false
28
+ - label: 'OpenVox 8.x'
29
+ puppet_version: '~> 8.0'
30
+ ruby_version: '3.2'
31
+ collection: 'openvox8'
32
+ experimental: false
27
33
  beaker:
28
34
  - label: beaker
29
35
  suite: default
@@ -45,7 +51,7 @@ jobs:
45
51
  PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
46
52
  steps:
47
53
  - name: checkout repo
48
- uses: actions/checkout@v2
54
+ uses: actions/checkout@v5
49
55
  - name: setup ruby
50
56
  uses: ruby/setup-ruby@v1
51
57
  with:
@@ -67,6 +73,9 @@ jobs:
67
73
  run: |
68
74
  bundle config path vendor
69
75
  bundle install -j $(nproc)
76
+ - name: set BEAKER_PUPPET_COLLECTION
77
+ if: ${{matrix.puppet.collection}}
78
+ run: echo "BEAKER_PUPPET_COLLECTION=${{matrix.puppet.collection}}" >> $GITHUB_ENV
70
79
  - name: 'run beaker:suite "${{matrix.beaker.label}}"'
71
80
  continue-on-error: ${{matrix.puppet.experimental || matrix.beaker.allowed_to_fail}}
72
81
  env:
@@ -13,9 +13,9 @@
13
13
  #
14
14
  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
15
15
  #
16
-
16
+ ---
17
17
  name: PR Tests
18
- on:
18
+ 'on':
19
19
  push:
20
20
  branches:
21
21
  # A test branch for seeing if your tests will pass in your personal fork
@@ -24,7 +24,7 @@ on:
24
24
  types: [opened, reopened, synchronize]
25
25
 
26
26
  env:
27
- PUPPET_VERSION: '~> 7'
27
+ PUPPET_VERSION: '~> 8'
28
28
 
29
29
  jobs:
30
30
  ruby-style:
@@ -32,11 +32,11 @@ jobs:
32
32
  runs-on: ubuntu-latest
33
33
  continue-on-error: true
34
34
  steps:
35
- - uses: actions/checkout@v3
36
- - name: "Install Ruby 2.7"
35
+ - uses: actions/checkout@v5
36
+ - name: "Install Ruby 3.2"
37
37
  uses: ruby/setup-ruby@v1
38
38
  with:
39
- ruby-version: 2.7
39
+ ruby-version: 3.2
40
40
  bundler-cache: true
41
41
  - run: |
42
42
  bundle show
@@ -59,7 +59,7 @@ jobs:
59
59
  env:
60
60
  PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
61
61
  steps:
62
- - uses: actions/checkout@v3
62
+ - uses: actions/checkout@v5
63
63
  - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
64
64
  uses: ruby/setup-ruby@v1
65
65
  with:
@@ -63,7 +63,7 @@ jobs:
63
63
  steps:
64
64
  - name: "Assert '${{ github.ref }}' is a tag"
65
65
  run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
66
- - uses: actions/checkout@v3
66
+ - uses: actions/checkout@v5
67
67
  with:
68
68
  ref: ${{ github.ref }}
69
69
  clean: true
@@ -116,7 +116,7 @@ jobs:
116
116
  tag: ${{ steps.tag-check.outputs.tag }}
117
117
  steps:
118
118
  - name: Checkout code
119
- uses: actions/checkout@v3
119
+ uses: actions/checkout@v5
120
120
  with:
121
121
  ref: ${{ github.ref }}
122
122
  clean: true
@@ -178,7 +178,7 @@ jobs:
178
178
  PKG_DIR: ${{ needs.releng-checks.outputs.pkg_dir }}
179
179
  steps:
180
180
  - name: Checkout code
181
- uses: actions/checkout@v3
181
+ uses: actions/checkout@v5
182
182
  with:
183
183
  ref: ${{ github.ref }}
184
184
  clean: true
data/.gitlab-ci.yml CHANGED
@@ -3,12 +3,10 @@
3
3
  #
4
4
  # https://puppet.com/docs/pe/2019.8/component_versions_in_recent_pe_releases.html
5
5
  # https://puppet.com/misc/puppet-enterprise-lifecycle
6
- # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
7
6
  # ------------------------------------------------------------------------------
8
7
  # Release Puppet Ruby EOL
9
- # SIMP 6.4 5.5 2.4.10 TBD
10
- # PE 2018.1 5.5 2.4.10 2021-01 (LTS overlap)
11
- # PE 2019.8 6.18 2.5.7 2022-12 (LTS)
8
+ # PE 2021.7 7.24 2.7.7 LTS EOS: 2024-08 EOL: 2025-02
9
+ # PE 2023.Y 7.24 2.7.7 Biannual updates
12
10
  ---
13
11
 
14
12
  stages:
@@ -229,20 +227,6 @@ variables:
229
227
  # Puppet Versions
230
228
  #-----------------------------------------------------------------------
231
229
 
232
- .pup_6_x: &pup_6_x
233
- image: 'ruby:2.5'
234
- variables:
235
- PUPPET_VERSION: '~> 6.0'
236
- BEAKER_PUPPET_COLLECTION: 'puppet6'
237
- MATRIX_RUBY_VERSION: '2.5'
238
-
239
- .pup_6_pe: &pup_6_pe
240
- image: 'ruby:2.5'
241
- variables:
242
- PUPPET_VERSION: '6.22.1'
243
- BEAKER_PUPPET_COLLECTION: 'puppet6'
244
- MATRIX_RUBY_VERSION: '2.5'
245
-
246
230
  .pup_7_x: &pup_7_x
247
231
  image: 'ruby:2.7'
248
232
  variables:
@@ -250,6 +234,14 @@ variables:
250
234
  BEAKER_PUPPET_COLLECTION: 'puppet7'
251
235
  MATRIX_RUBY_VERSION: '2.7'
252
236
 
237
+ .pup_8_x: &pup_8_x
238
+ image: 'ruby:3.2'
239
+ variables:
240
+ PUPPET_VERSION: '~> 8.0'
241
+ BEAKER_PUPPET_COLLECTION: 'puppet8'
242
+ MATRIX_RUBY_VERSION: '3.2'
243
+
244
+
253
245
  # Testing Environments
254
246
  #-----------------------------------------------------------------------
255
247
 
@@ -271,7 +263,7 @@ variables:
271
263
  - 'bundle exec rake spec'
272
264
 
273
265
  .beaker: &beaker
274
- image: ruby:2.7.2 # must be 2.7.2 if running in GCP
266
+ image: ruby:2.7.8 # must be 2.7.2 if running in GCP
275
267
  tags:
276
268
  - beaker
277
269
  before_script:
@@ -296,14 +288,13 @@ variables:
296
288
  # Unit Tests
297
289
  #-----------------------------------------------------------------------
298
290
 
299
- pup6.x-unit:
300
- <<: *pup_6_x
301
- <<: *unit_tests
302
-
303
291
  pup7.x-unit:
304
292
  <<: *pup_7_x
305
293
  <<: *unit_tests
306
294
 
295
+ pup8.x-unit:
296
+ <<: *pup_8_x
297
+ <<: *unit_tests
307
298
 
308
299
  # Repo-specific content
309
300
  # ==============================================================================
@@ -311,14 +302,14 @@ pup7.x-unit:
311
302
  #=======================================================================
312
303
  # Packaging test
313
304
 
314
- pup6.x-pkg:
315
- <<: *pup_6_x
305
+ pup7.x-pkg:
306
+ <<: *pup_7_x
316
307
  <<: *unit_tests
317
308
  script:
318
309
  'bundle exec rake pkg:gem'
319
310
 
320
- pup7.x-pkg:
321
- <<: *pup_7_x
311
+ pup8.x-pkg:
312
+ <<: *pup_8_x
322
313
  <<: *unit_tests
323
314
  script:
324
315
  'bundle exec rake pkg:gem'
@@ -331,38 +322,38 @@ pup7.x-pkg:
331
322
  # and the bundle is configured with this version of simp-beaker-helpers)
332
323
  # than in an acceptance test with a build user.
333
324
  default-bad-nodeset:
334
- <<: *pup_6_x
325
+ <<: *pup_8_x
335
326
  <<: *acceptance_base
336
327
  script:
337
328
  - 'RESULT=`bundle exec rake beaker:suites[default,oops] 1>/dev/null; echo $?`; (test $RESULT == "1")'
338
329
  - echo 'beaker:suites correctly failed with unknown nodeset'
339
330
 
340
331
  default:
341
- <<: *pup_6_x
332
+ <<: *pup_8_x
342
333
  <<: *acceptance_base
343
334
  script:
344
335
  - bundle exec rake beaker:suites[default]
345
336
 
346
337
  default-amzn2:
347
- <<: *pup_6_x
338
+ <<: *pup_8_x
348
339
  <<: *acceptance_base
349
340
  script:
350
341
  - bundle exec rake beaker:suites[default,amzn2]
351
342
 
352
343
  default-fips:
353
- <<: *pup_6_x
344
+ <<: *pup_8_x
354
345
  <<: *acceptance_base
355
346
  script:
356
347
  - BEAKER_fips=yes bundle exec rake beaker:suites[default]
357
348
 
358
349
  fips_from_fixtures:
359
- <<: *pup_6_x
350
+ <<: *pup_8_x
360
351
  <<: *acceptance_base
361
352
  script:
362
353
  - bundle exec rake beaker:suites[fips_from_fixtures]
363
354
 
364
- puppet6_collections:
365
- <<: *pup_6_x
355
+ puppet8_collections:
356
+ <<: *pup_8_x
366
357
  <<: *acceptance_base
367
358
  script:
368
359
  - bundle exec rake beaker:suites[puppet_collections]
@@ -374,20 +365,20 @@ puppet7_collections:
374
365
  - bundle exec rake beaker:suites[puppet_collections]
375
366
 
376
367
  oel_ssg:
377
- <<: *pup_6_x
368
+ <<: *pup_8_x
378
369
  <<: *acceptance_base
379
370
  script:
380
371
  - bundle exec rake beaker:suites[ssg,oel]
381
372
 
382
373
  windows:
383
- <<: *pup_6_x
374
+ <<: *pup_8_x
384
375
  <<: *acceptance_base
385
376
  allow_failure: true
386
377
  script:
387
378
  - bundle exec rake beaker:suites[windows]
388
379
 
389
380
  snapshot:
390
- <<: *pup_6_x
381
+ <<: *pup_8_x
391
382
  <<: *acceptance_base
392
383
  # This is prone to breakage in the underlying system
393
384
  allow_failure: true
data/.rubocop.yml CHANGED
@@ -1,12 +1,12 @@
1
1
  ---
2
- require:
2
+ plugins:
3
3
  - rubocop-performance
4
4
  - rubocop-rake
5
5
  - rubocop-rspec
6
6
  AllCops:
7
7
  NewCops: enable
8
8
  DisplayCopNames: true
9
- TargetRubyVersion: "2.7"
9
+ TargetRubyVersion: 2.7
10
10
  Include:
11
11
  - "**/*.rb"
12
12
  Exclude:
@@ -697,5 +697,5 @@ Style/StringChars:
697
697
  Enabled: false
698
698
  Style/SwapValues:
699
699
  Enabled: false
700
- Naming/PredicateName:
700
+ Naming/PredicatePrefix:
701
701
  Enabled: false
data/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ### 2.0.2 / 2025-08-12
2
+ * Fixed:
3
+ * Updated dependencies to allow beaker >= 7.0.0 (#239)
4
+
5
+ ### 2.0.1 / 2025-08-28
6
+ * Fixed:
7
+ * Rename `fips_enabled` method to `fips_enabled?`
8
+ to correct a rubocop complaint
9
+
1
10
  ### 2.0.0 / 2025-08-12
2
11
  * Added
3
12
  * Openvox support (re-publishing 1.36.0 as a breaking change)
data/Gemfile CHANGED
@@ -11,7 +11,7 @@ gemspec
11
11
  gem 'rake'
12
12
 
13
13
  group :system_tests do
14
- beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 7.0.0'])
14
+ beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 8.0.0'])
15
15
 
16
16
  if beaker_gem_options.to_s.include?(':')
17
17
  # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
@@ -25,8 +25,8 @@ group :system_tests do
25
25
  beaker_gem_options = Hash[
26
26
  beaker_gem_options.split(',').
27
27
  # Split passed options on k/v pairs
28
- map { |x| x.gsub('"', '').strip.split(%r{:\s|\s+=>\s+}) }. # Allow for either format hash keys
29
- map { |k, v| [k.delete(':').to_sym, v.strip] } # Convert all keys to symbols
28
+ map { |x| x.delete('"').strip.split(%r{:\s|\s+=>\s+}) } # Allow for either format hash keys
29
+ .map { |k, v| [k.delete(':').to_sym, v.strip] } # Convert all keys to symbols
30
30
  ] # Convert the whole thing to a valid Hash
31
31
  rescue StandardError => e
32
32
  raise "Invalid BEAKER_GEM_OPTIONS: '#{beaker_gem_options}' => '#{e}'"
@@ -37,15 +37,18 @@ group :system_tests do
37
37
 
38
38
  gem 'bcrypt_pbkdf'
39
39
  gem 'beaker-rspec'
40
- gem 'beaker_puppet_helpers'
41
40
  gem 'beaker-windows'
42
41
  gem 'ed25519'
43
42
  gem 'net-ssh'
43
+ gem 'openvox', ENV.fetch('OPENVOX_VERSION', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0']))
44
44
  gem 'pry-byebug', '~> 3.10.0'
45
- gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
46
- gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 8.0.0'
47
- gem 'rubocop', '~> 1.69.2'
48
- gem 'rubocop-performance', '~> 1.23.0'
49
- gem 'rubocop-rake', '~> 0.6.0'
50
- gem 'rubocop-rspec', '~> 3.3.0'
45
+ gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 9.0.0'
46
+ gem 'syslog' # Required for Ruby >= 3.4
47
+ end
48
+
49
+ group :tests do
50
+ gem 'rubocop', '~> 1.81.0'
51
+ gem 'rubocop-performance', '~> 1.26.0'
52
+ gem 'rubocop-rake', '~> 0.7.0'
53
+ gem 'rubocop-rspec', '~> 3.7.0'
51
54
  end
@@ -4,5 +4,5 @@
4
4
  module Simp; end
5
5
 
6
6
  module Simp::BeakerHelpers
7
- VERSION = '2.0.0'
7
+ VERSION = '2.0.2'
8
8
  end
@@ -1,5 +1,6 @@
1
1
  require 'English'
2
- require 'beaker-puppet'
2
+ require 'beaker_puppet_helpers'
3
+ require 'beaker_puppet_helpers/dsl'
3
4
  require 'bundler'
4
5
 
5
6
  # SIMP namespace
@@ -7,7 +8,8 @@ module Simp; end
7
8
 
8
9
  # SIMP Beaker helper methods for testing
9
10
  module Simp::BeakerHelpers
10
- include BeakerPuppet
11
+ include BeakerPuppetHelpers
12
+ include BeakerPuppetHelpers::DSL
11
13
 
12
14
  require 'simp/beaker_helpers/constants'
13
15
  require 'simp/beaker_helpers/inspec'
@@ -16,6 +18,9 @@ module Simp::BeakerHelpers
16
18
  require 'simp/beaker_helpers/version'
17
19
  require 'find'
18
20
 
21
+ PUPPET_MODULE_INSTALL_IGNORE = ['/.bundle', '/.git', '/.idea', '/.vagrant', '/.vendor', '/vendor', '/acceptance',
22
+ '/bundle', '/spec', '/tests', '/log', '/.svn', '/junit', '/pkg', '/example', '/tmp'].freeze
23
+
19
24
  @run_in_parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
20
25
 
21
26
  # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
@@ -114,12 +119,14 @@ module Simp::BeakerHelpers
114
119
  end
115
120
 
116
121
  # We can't cache this because it may change during a run
117
- def fips_enabled(sut)
122
+ def fips_enabled?(sut)
118
123
  on(sut,
119
124
  'cat /proc/sys/crypto/fips_enabled 2>/dev/null',
120
125
  accept_all_exit_codes: true).output.strip == '1'
121
126
  end
122
127
 
128
+ alias fips_enabled fips_enabled?
129
+
123
130
  def rsync_functional_on?(sut)
124
131
  # We have to check if rsync *still* works otherwise
125
132
  return false if @rsync_functional == false
@@ -780,14 +787,6 @@ module Simp::BeakerHelpers
780
787
  on sut, 'puppet config set stringify_facts false'
781
788
  end
782
789
 
783
- # Occasionally we run across something similar to BKR-561, so to ensure we
784
- # at least have the host defaults:
785
- #
786
- # :hieradatadir is used as a canary here; it isn't the only missing key
787
- unless sut.host_hash.key? :hieradatadir
788
- configure_type_defaults_on(sut)
789
- end
790
-
791
790
  if os_info['family'] == 'RedHat'
792
791
  # OS-specific items
793
792
  if os_info['name'] == 'RedHat'
@@ -1500,10 +1499,8 @@ module Simp::BeakerHelpers
1500
1499
  def install_puppet
1501
1500
  install_info = get_puppet_install_info
1502
1501
 
1503
- # In case Beaker needs this info internally
1504
- if install_info[:puppet_collection]
1505
- ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
1506
- end
1502
+ # In case Beaker needs this info internally
1503
+ ENV['BEAKER_PUPPET_COLLECTION'] ||= install_info[:puppet_collection] if install_info.is_a?(Hash) && install_info.key?(:puppet_collection)
1507
1504
 
1508
1505
  require 'beaker_puppet_helpers'
1509
1506
  run_puppet_install_helper_on(hosts)
data/renovate.json ADDED
@@ -0,0 +1,6 @@
1
+ {
2
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
3
+ "extends": [
4
+ "config:recommended"
5
+ ]
6
+ }
@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
22
22
 
23
23
  s.required_ruby_version = '>= 2.7.0'
24
24
 
25
- s.add_runtime_dependency 'beaker', ['>= 4.17.0', '< 7.0.0']
26
- s.add_runtime_dependency 'beaker-docker', ['>= 0.8.3', '< 3.0.0']
27
- s.add_runtime_dependency 'beaker-puppet', ['>= 1.18.14', '< 5.0.0']
28
- s.add_runtime_dependency 'beaker-rspec', '~> 8.0'
29
- s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 2.0.0']
30
- s.add_runtime_dependency 'docker-api', ['>= 2.1.0', '< 3.0.0']
31
- s.add_runtime_dependency 'highline', ['>= 2.0', '< 4.0.0']
32
- s.add_runtime_dependency 'nokogiri', '~> 1.8'
25
+ s.add_runtime_dependency 'beaker', ['>= 4.28.1', '< 8.0.0']
26
+ s.add_runtime_dependency 'beaker-docker', ['>= 0.8.3', '< 4.0.0']
27
+ s.add_runtime_dependency 'beaker-rspec', ['>= 8.0', '< 10.0.0']
28
+ s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 3.0.0']
29
+ s.add_runtime_dependency 'beaker_puppet_helpers', ['>= 2.0.0', '< 4.0.0']
30
+ s.add_runtime_dependency 'docker-api', ['>= 2.1.0', '< 3.0.0']
31
+ s.add_runtime_dependency 'highline', ['>= 2.0', '< 4.0.0']
32
+ s.add_runtime_dependency 'nokogiri', '~> 1.8'
33
33
 
34
34
  ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
35
35
  s.files = %x(git ls-files).split("\n")
@@ -11,4 +11,4 @@ CONFIG:
11
11
  log_level: verbose
12
12
  synced_folder: disabled
13
13
  type: aio
14
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
14
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -24,4 +24,4 @@ CONFIG:
24
24
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
25
25
  hmac:
26
26
  - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
27
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
27
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -12,7 +12,7 @@ HOSTS:
12
12
  CONFIG:
13
13
  log_level: verbose
14
14
  type: aio
15
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
15
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
16
16
  ssh:
17
17
  password: root
18
18
  auth_methods:
@@ -19,7 +19,7 @@ CONFIG:
19
19
  log_level: verbose
20
20
  type: aio
21
21
  vagrant_cpus: 2
22
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
22
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
23
23
  ssh:
24
24
  keepalive: true
25
25
  keepalive_interval: 10
@@ -11,4 +11,4 @@ HOSTS:
11
11
  CONFIG:
12
12
  log_level: verbose
13
13
  type: aio
14
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
14
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -7,9 +7,9 @@ context 'after copy_fixture_modules_to( hosts )' do
7
7
  end
8
8
 
9
9
  describe "fact_on(default,'root_home')" do
10
- it 'does not return value of `root_home`' do
11
- pending 'Conflicts with beaker_puppet_helpers' unless Gem::Version.new(pfact_on(default, 'puppetversion').to_s) < Gem::Version.new('8')
12
- expect(Beaker::DSL::Helpers::FacterHelpers.fact_on(default, 'root_home').to_s).to eq ''
10
+ # fact_on in beaker_puppet_helpers is equivalent to pfact_on
11
+ xit 'does not return value of `root_home`' do
12
+ expect(fact_on(default, 'root_home').to_s).to eq ''
13
13
  end
14
14
  end
15
15
 
@@ -13,7 +13,7 @@ HOSTS:
13
13
  CONFIG:
14
14
  log_level: verbose
15
15
  type: aio
16
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
16
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
17
17
  libvirt:
18
18
  # Ensure that we use the best option available
19
19
  'cpu_mode': 'host-passthrough'
@@ -43,13 +43,13 @@ hosts.each do |host|
43
43
  context 'existing snapshot' do
44
44
  let(:init_snapshot) { 'handoff' }
45
45
 
46
- include_examples 'a snapshot test'
46
+ it_behaves_like 'a snapshot test'
47
47
  end
48
48
 
49
49
  context 'missing snapshot' do
50
50
  let(:init_snapshot) { 'missing' }
51
51
 
52
- include_examples 'a snapshot test'
52
+ it_behaves_like 'a snapshot test'
53
53
  end
54
54
  end
55
55
  end
@@ -23,4 +23,4 @@ HOSTS:
23
23
  CONFIG:
24
24
  log_level: verbose
25
25
  type: aio
26
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
26
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -25,4 +25,4 @@ HOSTS:
25
25
  CONFIG:
26
26
  log_level: verbose
27
27
  type: aio
28
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
28
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -24,4 +24,4 @@ HOSTS:
24
24
  CONFIG:
25
25
  log_level: verbose
26
26
  type: aio
27
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
27
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
@@ -24,4 +24,4 @@ HOSTS:
24
24
  CONFIG:
25
25
  log_level: verbose
26
26
  type: aio
27
- puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
27
+ puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-beaker-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2025-08-12 00:00:00.000000000 Z
12
+ date: 2025-10-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker
@@ -17,20 +17,20 @@ dependencies:
17
17
  requirements:
18
18
  - - ">="
19
19
  - !ruby/object:Gem::Version
20
- version: 4.17.0
20
+ version: 4.28.1
21
21
  - - "<"
22
22
  - !ruby/object:Gem::Version
23
- version: 7.0.0
23
+ version: 8.0.0
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
28
  - - ">="
29
29
  - !ruby/object:Gem::Version
30
- version: 4.17.0
30
+ version: 4.28.1
31
31
  - - "<"
32
32
  - !ruby/object:Gem::Version
33
- version: 7.0.0
33
+ version: 8.0.0
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: beaker-docker
36
36
  requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
40
40
  version: 0.8.3
41
41
  - - "<"
42
42
  - !ruby/object:Gem::Version
43
- version: 3.0.0
43
+ version: 4.0.0
44
44
  type: :runtime
45
45
  prerelease: false
46
46
  version_requirements: !ruby/object:Gem::Requirement
@@ -50,61 +50,67 @@ dependencies:
50
50
  version: 0.8.3
51
51
  - - "<"
52
52
  - !ruby/object:Gem::Version
53
- version: 3.0.0
53
+ version: 4.0.0
54
54
  - !ruby/object:Gem::Dependency
55
- name: beaker-puppet
55
+ name: beaker-rspec
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - ">="
59
59
  - !ruby/object:Gem::Version
60
- version: 1.18.14
60
+ version: '8.0'
61
61
  - - "<"
62
62
  - !ruby/object:Gem::Version
63
- version: 5.0.0
63
+ version: 10.0.0
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - ">="
69
69
  - !ruby/object:Gem::Version
70
- version: 1.18.14
70
+ version: '8.0'
71
71
  - - "<"
72
72
  - !ruby/object:Gem::Version
73
- version: 5.0.0
73
+ version: 10.0.0
74
74
  - !ruby/object:Gem::Dependency
75
- name: beaker-rspec
75
+ name: beaker-vagrant
76
76
  requirement: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - "~>"
78
+ - - ">="
79
79
  - !ruby/object:Gem::Version
80
- version: '8.0'
80
+ version: 0.6.4
81
+ - - "<"
82
+ - !ruby/object:Gem::Version
83
+ version: 3.0.0
81
84
  type: :runtime
82
85
  prerelease: false
83
86
  version_requirements: !ruby/object:Gem::Requirement
84
87
  requirements:
85
- - - "~>"
88
+ - - ">="
86
89
  - !ruby/object:Gem::Version
87
- version: '8.0'
90
+ version: 0.6.4
91
+ - - "<"
92
+ - !ruby/object:Gem::Version
93
+ version: 3.0.0
88
94
  - !ruby/object:Gem::Dependency
89
- name: beaker-vagrant
95
+ name: beaker_puppet_helpers
90
96
  requirement: !ruby/object:Gem::Requirement
91
97
  requirements:
92
98
  - - ">="
93
99
  - !ruby/object:Gem::Version
94
- version: 0.6.4
100
+ version: 2.0.0
95
101
  - - "<"
96
102
  - !ruby/object:Gem::Version
97
- version: 2.0.0
103
+ version: 4.0.0
98
104
  type: :runtime
99
105
  prerelease: false
100
106
  version_requirements: !ruby/object:Gem::Requirement
101
107
  requirements:
102
108
  - - ">="
103
109
  - !ruby/object:Gem::Version
104
- version: 0.6.4
110
+ version: 2.0.0
105
111
  - - "<"
106
112
  - !ruby/object:Gem::Version
107
- version: 2.0.0
113
+ version: 4.0.0
108
114
  - !ruby/object:Gem::Dependency
109
115
  name: docker-api
110
116
  requirement: !ruby/object:Gem::Requirement
@@ -196,6 +202,7 @@ files:
196
202
  - lib/simp/beaker_helpers/version.rb
197
203
  - lib/simp/beaker_helpers/windows.rb
198
204
  - lib/simp/rake/beaker.rb
205
+ - renovate.json
199
206
  - simp-beaker-helpers.gemspec
200
207
  - spec/acceptance/nodesets/amzn2.yml
201
208
  - spec/acceptance/nodesets/default.yml