Move to beaker_puppet_helpers

.github/workflows/ci.yml

@@ -28,12 +28,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.4'
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
           - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
     name: Unit / Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v3
@@ -56,12 +55,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.4'
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
           - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
         example: ${{ fromJson(needs.pre.outputs.examples) }}
     name: Acceptance / Ruby ${{ matrix.ruby }} - ${{ matrix.example }}
     steps:

Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 group :release do
-  gem 'github_changelog_generator', '~> 1.16', require: false if RUBY_VERSION >= '2.5'
+  gem 'github_changelog_generator', '~> 1.16', require: false
 end

examples/defaults_basic_dependency/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 gem 'voxpupuli-acceptance', path: '../..'

examples/defaults_facts/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 gem 'voxpupuli-acceptance', path: '../..'

examples/defaults_fixtures/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 gem 'voxpupuli-acceptance', path: '../..'
 gem 'puppetlabs_spec_helper'

examples/defaults_no_dependencies/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 gem 'voxpupuli-acceptance', path: '../..'

examples/no_modules/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+# TODO: pending a release
+gem 'beaker_puppet_helpers', github: 'voxpupuli/beaker_puppet_helpers'
+
 gem 'voxpupuli-acceptance', path: '../..'

lib/voxpupuli/acceptance/fixtures.rb

@@ -85,7 +85,7 @@ def install_modules_on(hosts, modules, logger = nil)
                 logger.debug("Copying module #{name} from #{source_path} to #{target_file}") if logger
 
                 scp_to(host, source_path, target_file)
-                on host, puppet("module install --force --ignore-dependencies '#{target_file}'")
+                on host, "puppet module install --force --ignore-dependencies '#{target_file}'"
               end
             end
           end

lib/voxpupuli/acceptance/spec_helper_acceptance.rb

@@ -1,27 +1,25 @@
 require_relative 'examples'
 
 def configure_beaker(modules: :metadata, &block)
-  ENV['PUPPET_INSTALL_TYPE'] ||= 'agent'
-  ENV['BEAKER_PUPPET_COLLECTION'] ||= 'puppet7'
+  collection = ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet')
   ENV['BEAKER_debug'] ||= 'true'
   ENV['BEAKER_HYPERVISOR'] ||= 'docker'
 
   # On Ruby 3 this doesn't appear to matter but on Ruby 2 beaker-hiera must be
   # included before beaker-rspec so Beaker::DSL is final
   require 'beaker-hiera'
+  require 'beaker_puppet_helpers'
   require 'beaker-rspec'
-  require 'beaker-puppet'
-  require 'beaker/puppet_install_helper'
 
-  case modules
-  when :metadata
-    require 'beaker/module_install_helper'
-    $module_source_dir = get_module_source_directory caller
-  when :fixtures
-    require_relative 'fixtures'
-  end
+  require_relative 'fixtures' if modules == :fixtures
 
-  run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+  unless ENV['BEAKER_provision'] == 'no'
+    block_on hosts, run_in_parallel: true do |host|
+      BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection) unless collection.empty?
+      package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host)
+      host.install_package(package_name)
+    end
+  end
 
   RSpec.configure do |c|
     # Readable test descriptions
@@ -31,8 +29,7 @@ def configure_beaker(modules: :metadata, &block)
     c.before :suite do
       case modules
       when :metadata
-        install_module
-        install_module_dependencies
+        install_local_module_on(hosts)
       when :fixtures
         fixture_modules = File.join(Dir.pwd, 'spec', 'fixtures', 'modules')
         Voxpupuli::Acceptance::Fixtures.install_fixture_modules_on(hosts, fixture_modules)

voxpupuli-acceptance.gemspec

@@ -12,17 +12,15 @@ Gem::Specification.new do |s|
 
   s.files       = Dir['lib/**/*.rb']
 
-  s.required_ruby_version = '>= 2.4', '< 4'
+  s.required_ruby_version = '>= 2.5', '< 4'
 
   # Testing
   s.add_runtime_dependency 'bcrypt_pbkdf'
   s.add_runtime_dependency 'beaker', '~> 4.33'
   s.add_runtime_dependency 'beaker-docker'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.4'
   s.add_runtime_dependency 'beaker-hostgenerator', '>= 1.1.22'
-  s.add_runtime_dependency 'beaker-module_install_helper'
-  s.add_runtime_dependency 'beaker-puppet'
-  s.add_runtime_dependency 'beaker-puppet_install_helper'
+  s.add_runtime_dependency 'beaker_puppet_helpers'
   s.add_runtime_dependency 'beaker-rspec'
   s.add_runtime_dependency 'beaker-vagrant'
   s.add_runtime_dependency 'puppet-modulebuilder', '~> 0.1'