voxpupuli-acceptance 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6866e9d634d4af76ba1ca0f0f66a5c500b233922d7e4bf9778fc8b6c8ffb64c
-  data.tar.gz: 8177647c83516dbe5e22f16ca62dd16d7f633e05e67836ec37ad27fc3259d922
+  metadata.gz: a2c35bcd82a31ef76e426ba44392b798467a4daf852a8e21940c30adfa1ee976
+  data.tar.gz: e94e870258088116e11d0e5c155fdec57c4034e34d429568ddd9e1608a7ac8a4
 SHA512:
-  metadata.gz: 9822328d43646e2a43b7dfff7c73665c08631797049aebde52b90d84bfa118bbeabbbfde23353519841d04edcaa28c34e8b4942fdb98b5b9e2f08e88270e5bcd
-  data.tar.gz: c2358fa82e380f9be4d4a2297dc021ea30764e7bc2c989fc53ba1bda6873d6731bae284e7fd183aaa8a39752baed9fe7d29cb10356d44b33570617e2989f51b3
+  metadata.gz: b39026527782daf48daecee2a118f29f4ebbc3a065e8d29f3ffe3225fdf51ca05fd44596aa4d588861a6e32a75f1b253e9af3ab4db941195272d66670a29e4be
+  data.tar.gz: 177c1b5ae6452a0e76e4daa3d99ec9ef16472595897ec6c60f760bb8e811788849a0e2d668eff312c8c6e879313f3eb5a3fae32a0e5e3375035fbfb9b2dd6dde

data/lib/voxpupuli/acceptance/fixtures.rb

@@ -93,7 +93,7 @@ module Voxpupuli
           nil
         end
 
-        # Create a temporay directory on the host, similar to Dir.mktmpdir but
+        # Create a temporary directory on the host, similar to Dir.mktmpdir but
         # on a remote host.
         #
         # @example

data/lib/voxpupuli/acceptance/rake.rb

@@ -1,6 +1,6 @@
 begin
   # Fixtures can be needed because of spec_prep
-  # spec_prep taks is provided by puppetlabs_spec_helper
+  # spec_prep task is provided by puppetlabs_spec_helper
   require 'puppetlabs_spec_helper/tasks/fixtures'
 rescue LoadError
   # we only need that during CI, so we rescue the LoadError

data/lib/voxpupuli/acceptance/spec_helper_acceptance.rb

@@ -2,7 +2,7 @@ require_relative 'examples'
 
 def configure_beaker(modules: :metadata, &block)
   collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet'
-  ENV['BEAKER_debug'] ||= 'true'
+  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
@@ -13,10 +13,12 @@ def configure_beaker(modules: :metadata, &block)
 
   require_relative 'fixtures' if modules == :fixtures
 
-  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 == 'none'
-      package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host)
+      unless %w[none preinstalled].include?(collection)
+        BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
+      end
+      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.puppet_package_name(host, prefer_aio: collection != 'none'))
       host.install_package(package_name)
 
       # by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voxpupuli-acceptance
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf