simp-beaker-helpers 1.36.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a6aa9c1e468fc6b3902a01b20775a6fa2e749bb1a5d5ba52cd161943cd3b80
-  data.tar.gz: bd67173fa6a6d65a88b631fcc7a8040de13f3d3ed763da44b605fbc7b350bc55
+  metadata.gz: 3ce5749e98e91120a7fe096123986044dadded4f84f2c2e7934c1d839078a17d
+  data.tar.gz: 1aebb5a748c01c77ee71f8dd042857bef2fde943f591b313bef04b9c69962927
 SHA512:
-  metadata.gz: c88ef399a0c91f621fa1610abfa9ee8cbfad327a5e84b39b487fa1c3d838333732d3340cb8c4967a88d90ab6d0788d3c5104adfb8780d7a75316a5a863da131e
-  data.tar.gz: fc1831aa56ea337aceef83ba23b9f2fd938b32ec016e33f3ee5e5c526a932530cb30ab1b81c1531d1fba4fe394b32d23d924512f7865bc4586ffdeeb115c01a3
+  metadata.gz: deb933f2d39a411b0c8543dc4aff0977f43e6e30b9c3b92c9061891fc6c544ee4dd44c89e64dfec198143ae4b7fe53ac0936a290da0bffbc99dc06c3eac3543a
+  data.tar.gz: 3ef97ba170ee15f8cdef7b11128feb77102ac55cfda46f963e42e60165866d406be3480cae0d926d21420f5955abd57896a4c22cbb042c602523578b083b4453

data/.github/workflows/add_new_issue_to_triage_project.yml

@@ -15,7 +15,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/simp/projects/11
           github-token: ${{ secrets.AUTO_TRIAGE_TOKEN }}

data/.github/workflows/pr_acceptance.yml

@@ -45,7 +45,7 @@ jobs:
       PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
     steps:
       - name: checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: setup ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/pr_tests.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: "Install Ruby 2.7"
         uses: ruby/setup-ruby@v1
         with:
@@ -59,7 +59,7 @@ jobs:
     env:
       PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/tag_deploy_rubygem.yml

@@ -63,7 +63,7 @@ jobs:
     steps:
       - name: "Assert '${{ github.ref }}' is a tag"
         run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
           clean: true
@@ -116,7 +116,7 @@ jobs:
       tag: ${{ steps.tag-check.outputs.tag }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
           clean: true
@@ -178,7 +178,7 @@ jobs:
       PKG_DIR: ${{ needs.releng-checks.outputs.pkg_dir }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
           clean: true

data/.gitignore

@@ -22,3 +22,4 @@ dist
 /junit
 /log
 /doc
+/Gemfile.lock

data/.gitlab-ci.yml

@@ -3,12 +3,10 @@
 #
 # https://puppet.com/docs/pe/2019.8/component_versions_in_recent_pe_releases.html
 # https://puppet.com/misc/puppet-enterprise-lifecycle
-# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
 # ------------------------------------------------------------------------------
 # Release       Puppet   Ruby    EOL
-# SIMP 6.4      5.5      2.4.10  TBD
-# PE 2018.1     5.5      2.4.10  2021-01 (LTS overlap)
-# PE 2019.8     6.18     2.5.7   2022-12 (LTS)
+# PE 2021.7     7.24     2.7.7   LTS EOS: 2024-08 EOL: 2025-02
+# PE 2023.Y     7.24     2.7.7   Biannual updates
 ---
 
 stages:
@@ -229,20 +227,6 @@ variables:
 # Puppet Versions
 #-----------------------------------------------------------------------
 
-.pup_6_x: &pup_6_x
-  image: 'ruby:2.5'
-  variables:
-    PUPPET_VERSION: '~> 6.0'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-    MATRIX_RUBY_VERSION: '2.5'
-
-.pup_6_pe: &pup_6_pe
-  image: 'ruby:2.5'
-  variables:
-    PUPPET_VERSION: '6.22.1'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-    MATRIX_RUBY_VERSION: '2.5'
-
 .pup_7_x: &pup_7_x
   image: 'ruby:2.7'
   variables:
@@ -250,6 +234,14 @@ variables:
     BEAKER_PUPPET_COLLECTION: 'puppet7'
     MATRIX_RUBY_VERSION: '2.7'
 
+.pup_8_x: &pup_8_x
+  image: 'ruby:3.2'
+  variables:
+    PUPPET_VERSION: '~> 8.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet8'
+    MATRIX_RUBY_VERSION: '3.2'
+
+
 # Testing Environments
 #-----------------------------------------------------------------------
 
@@ -271,7 +263,7 @@ variables:
     - 'bundle exec rake spec'
 
 .beaker: &beaker
-  image: ruby:2.7.2  # must be 2.7.2 if running in GCP
+  image: ruby:2.7.8  # must be 2.7.2 if running in GCP
   tags:
     - beaker
   before_script:
@@ -296,14 +288,13 @@ variables:
 # Unit Tests
 #-----------------------------------------------------------------------
 
-pup6.x-unit:
-  <<: *pup_6_x
-  <<: *unit_tests
-
 pup7.x-unit:
   <<: *pup_7_x
   <<: *unit_tests
 
+pup8.x-unit:
+  <<: *pup_8_x
+  <<: *unit_tests
 
 # Repo-specific content
 # ==============================================================================
@@ -311,14 +302,14 @@ pup7.x-unit:
 #=======================================================================
 # Packaging test
 
-pup6.x-pkg:
-  <<: *pup_6_x
+pup7.x-pkg:
+  <<: *pup_7_x
   <<: *unit_tests
   script:
     'bundle exec rake pkg:gem'
 
-pup7.x-pkg:
-  <<: *pup_7_x
+pup8.x-pkg:
+  <<: *pup_8_x
   <<: *unit_tests
   script:
     'bundle exec rake pkg:gem'
@@ -331,38 +322,38 @@ pup7.x-pkg:
 # and the bundle is configured with this version of simp-beaker-helpers)
 # than in an acceptance test with a build user.
 default-bad-nodeset:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - 'RESULT=`bundle exec rake beaker:suites[default,oops] 1>/dev/null; echo $?`; (test $RESULT == "1")'
     - echo 'beaker:suites correctly failed with unknown nodeset'
 
 default:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - bundle exec rake beaker:suites[default]
 
 default-amzn2:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - bundle exec rake beaker:suites[default,amzn2]
 
 default-fips:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - BEAKER_fips=yes bundle exec rake beaker:suites[default]
 
 fips_from_fixtures:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - bundle exec rake beaker:suites[fips_from_fixtures]
 
-puppet6_collections:
-  <<: *pup_6_x
+puppet8_collections:
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - bundle exec rake beaker:suites[puppet_collections]
@@ -374,20 +365,20 @@ puppet7_collections:
     - bundle exec rake beaker:suites[puppet_collections]
 
 oel_ssg:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   script:
     - bundle exec rake beaker:suites[ssg,oel]
 
 windows:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   allow_failure: true
   script:
     - bundle exec rake beaker:suites[windows]
 
 snapshot:
-  <<: *pup_6_x
+  <<: *pup_8_x
   <<: *acceptance_base
   # This is prone to breakage in the underlying system
   allow_failure: true

data/.rubocop.yml

@@ -697,5 +697,5 @@ Style/StringChars:
   Enabled: false
 Style/SwapValues:
   Enabled: false
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 2.0.1 / 2025-08-28
+* Fixed:
+  * Rename `fips_enabled` method to `fips_enabled?`
+    to correct a rubocop complaint
+
+### 2.0.0 / 2025-08-12
+* Added
+  * Openvox support (re-publishing 1.36.0 as a breaking change)
+
 ### 1.36.1 / 2025-08-12
 * Fixed:
   * Reverted breaking change (#236)

data/Gemfile

@@ -37,13 +37,14 @@ group :system_tests do
 
   gem 'bcrypt_pbkdf'
   gem 'beaker-rspec'
+  gem 'beaker_puppet_helpers'
   gem 'beaker-windows'
   gem 'ed25519'
   gem 'net-ssh'
   gem 'pry-byebug', '~> 3.10.0'
   gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
   gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 8.0.0'
-  gem 'rubocop', '~> 1.69.2'
+  gem 'rubocop', '~> 1.80.0'
   gem 'rubocop-performance', '~> 1.23.0'
   gem 'rubocop-rake', '~> 0.6.0'
   gem 'rubocop-rspec', '~> 3.3.0'

data/lib/simp/beaker_helpers/version.rb

@@ -4,5 +4,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.36.1'
+  VERSION = '2.0.1'
 end

data/lib/simp/beaker_helpers.rb

@@ -114,12 +114,14 @@ module Simp::BeakerHelpers
   end
 
   # We can't cache this because it may change during a run
-  def fips_enabled(sut)
+  def fips_enabled?(sut)
     on(sut,
               'cat /proc/sys/crypto/fips_enabled 2>/dev/null',
               accept_all_exit_codes: true).output.strip == '1'
   end
 
+  alias fips_enabled fips_enabled?
+
   def rsync_functional_on?(sut)
     # We have to check if rsync *still* works otherwise
     return false if @rsync_functional == false
@@ -764,7 +766,7 @@ module Simp::BeakerHelpers
             u.strip!
             u = u.split(':')
             %r{^(/|/dev/.*|/s?bin/?.*|/proc/?.*)$}.match?(u[5]) ? [nil] : [u[0], u[5]]
-          end
+          end,
         ]
 
         user_info.each_key do |user|
@@ -1393,7 +1395,7 @@ module Simp::BeakerHelpers
   #
   # @return [String,Nil] the `puppet-agent` version or nil
   #
-  def latest_puppet_agent_version_for(puppet_version)
+  def latest_puppet_agent_version_for(puppet_version, puppet_collection_name = 'puppet')
     return nil if puppet_version.nil?
 
     require 'rubygems/requirement'
@@ -1418,7 +1420,7 @@ module Simp::BeakerHelpers
       puppet_gems = nil
 
       Bundler.with_unbundled_env do
-        puppet_gems = `gem search -ra -e puppet`.match(%r{\((.+)\)})
+        puppet_gems = `gem search -ra -e #{puppet_collection_name}`.match(%r{\((.+)\)})
       end
 
       if puppet_gems
@@ -1467,10 +1469,10 @@ module Simp::BeakerHelpers
 
     if puppet_agent_version.nil?
       if (puppet_collection = ENV['BEAKER_PUPPET_COLLECTION'] || host.options['puppet_collection'])
-        raise("Error: Puppet Collection '#{puppet_collection}' must match /puppet(\\d+)/") unless puppet_collection =~ %r{puppet(\d+)}
-        puppet_install_version = "~> #{::Regexp.last_match(1)}"
-        puppet_agent_version = latest_puppet_agent_version_for(puppet_install_version)
-
+        raise("Error: Puppet Collection '#{puppet_collection}' must match /(puppet|openvox)(\\d+)/") unless puppet_collection =~ %r{(puppet|openvox)(\d+)}
+        puppet_collection_name = ::Regexp.last_match(1)
+        puppet_install_version = "~> #{::Regexp.last_match(2)}"
+        puppet_agent_version = latest_puppet_agent_version_for(puppet_install_version, puppet_collection_name)
       else
         puppet_agent_version = latest_puppet_agent_version_for(DEFAULT_PUPPET_AGENT_VERSION)
       end
@@ -1488,19 +1490,27 @@ module Simp::BeakerHelpers
     }
   end
 
+  def run_puppet_install_helper_on(hosts)
+    block_on hosts, run_in_parallel: true do |host|
+      BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, ENV['BEAKER_PUPPET_COLLECTION'])
+      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, ENV['BEAKER_PUPPET_COLLECTION']))
+      host.install_package(package_name)
+    end
+  end
+
   # Replacement for `install_puppet` in spec_helper_acceptance.rb
   def install_puppet
     install_info = get_puppet_install_info
 
     # In case  Beaker needs this info internally
-    ENV['PUPPET_INSTALL_VERSION'] = install_info[:puppet_install_version]
     if install_info[:puppet_collection]
       ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
     end
 
-    require 'beaker-puppet'
-    install_puppet_on(hosts, version: install_info[:puppet_install_version])
+    require 'beaker_puppet_helpers'
+    run_puppet_install_helper_on(hosts)
   end
+  alias install_openvox install_puppet
 
   # Configure all SIMP repos on a host and disable all repos in the disable Array
   #

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -8,7 +8,8 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "fact_on(default,'root_home')" do
     it 'does not return value of `root_home`' do
-      expect(fact_on(default, 'root_home').to_s).to eq ''
+      pending 'Conflicts with beaker_puppet_helpers' unless Gem::Version.new(pfact_on(default, 'puppetversion').to_s) < Gem::Version.new('8')
+      expect(Beaker::DSL::Helpers::FacterHelpers.fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -64,6 +64,11 @@ describe 'Simp::BeakerHelpers' do
     ].join(', ')})\n"
   end
 
+  let(:openvox_gem_search_results) do
+    # subset of results, but still exercises code
+    "openvox (8.19.2, 8.19.1, 8.19.0, 7.37.2, 7.37.1)\n"
+  end
+
   context '#latest_puppet_agent_version_for' do
     context 'using table' do
       it 'maps exact Puppet version' do
@@ -206,6 +211,17 @@ describe 'Simp::BeakerHelpers' do
       expect(helper.get_puppet_install_info).to eq expected
     end
 
+    it 'extracts openvox info from BEAKER_PUPPET_COLLECTION' do
+      allow(helper).to receive(:`).with('gem search -ra -e openvox').and_return(openvox_gem_search_results)
+      helper.host.options = { 'puppet_collection' => 'openvox8' }
+      expected = {
+        puppet_install_version: '8.19.2',
+        puppet_collection: 'openvox8',
+        puppet_install_type: 'agent'
+      }
+      expect(helper.get_puppet_install_info).to eq expected
+    end
+
     it 'extracts info from PUPPET_INSTALL_TYPE' do
       ENV['PUPPET_INSTALL_TYPE'] = 'pe'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.36.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-12 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -196,6 +196,7 @@ files:
 - lib/simp/beaker_helpers/version.rb
 - lib/simp/beaker_helpers/windows.rb
 - lib/simp/rake/beaker.rb
+- renovate.json
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/amzn2.yml
 - spec/acceptance/nodesets/default.yml