Revert "(#229) Allow openvox installation (#230)" (#237)

This reverts commit d117635.

Fixes #236

Author: silug

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.36.1 / 2025-08-12
+* Fixed:
+  * Reverted breaking change (#236)
+
 ### 1.36.0 / 2025-06-23
 * Added
   * Openvox support

Gemfile

@@ -37,7 +37,6 @@ group :system_tests do
 
   gem 'bcrypt_pbkdf'
   gem 'beaker-rspec'
-  gem 'beaker_puppet_helpers'
   gem 'beaker-windows'
   gem 'ed25519'
   gem 'net-ssh'

lib/simp/beaker_helpers.rb

@@ -764,7 +764,7 @@ def linux_errata(suts)
             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 +1393,7 @@ def pluginsync_on(_suts = hosts)
   #
   # @return [String,Nil] the `puppet-agent` version or nil
   #
-  def latest_puppet_agent_version_for(puppet_version, puppet_collection_name = 'puppet')
+  def latest_puppet_agent_version_for(puppet_version)
     return nil if puppet_version.nil?
 
     require 'rubygems/requirement'
@@ -1418,7 +1418,7 @@ def latest_puppet_agent_version_for(puppet_version, puppet_collection_name = 'pu
       puppet_gems = nil
 
       Bundler.with_unbundled_env do
-        puppet_gems = `gem search -ra -e #{puppet_collection_name}`.match(%r{\((.+)\)})
+        puppet_gems = `gem search -ra -e puppet`.match(%r{\((.+)\)})
       end
 
       if puppet_gems
@@ -1467,10 +1467,10 @@ def get_puppet_install_info
 
     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|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)
+        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)
+
       else
         puppet_agent_version = latest_puppet_agent_version_for(DEFAULT_PUPPET_AGENT_VERSION)
       end
@@ -1488,27 +1488,19 @@ def get_puppet_install_info
     }
   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_helpers'
-    run_puppet_install_helper_on(hosts)
+    require 'beaker-puppet'
+    install_puppet_on(hosts, version: install_info[:puppet_install_version])
   end
-  alias install_openvox install_puppet
 
   # Configure all SIMP repos on a host and disable all repos in the disable Array
   #

lib/simp/beaker_helpers/version.rb

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

spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -8,8 +8,7 @@
 
   describe "fact_on(default,'root_home')" do
     it 'does not return value of `root_home`' do
-      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 ''
+      expect(fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 

spec/lib/simp/beaker_helpers_spec.rb

@@ -64,11 +64,6 @@ def initialize
     ].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
@@ -211,17 +206,6 @@ def initialize
       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'