voxpupuli-acceptance 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642e136a211692879b289dcf2389864b46bacf8d461c9fe48edc355707d26009
-  data.tar.gz: 97c5d37b5a8bea41a77d33599312064ac49d3a076ec27e9d865203fd330cd1cd
+  metadata.gz: 4a28f833be1047f3498ba310d5f70fae109535f5c03026ddef68e9e81b04393a
+  data.tar.gz: a1d5817a9a0bc35f9355a034ee3f2e703d702b6e71a94f9f51772627351bb181
 SHA512:
-  metadata.gz: d598fd6edde8da8a9dcef9dea2f14b0a0baa028301f1cd82a023f7efd2de5a3fde1e849b5b9a79940dd9af612660dc74453b33fd65174f282e98fb01b24535d6
-  data.tar.gz: 7aa7c03a60560b8094f4972c905299f3739e21659aa1bfbaf263bb9aec2223ca6966c7da288432e12c5e8ed572221a50315ecd722a5a88b00f900fad75efa664
+  metadata.gz: 87f56db037b8ab28e46f4d9d37ef578f3ee7c51365e68ec2623f459140ca4f09c99af5f7c52a4479d7c61e94f8d5fcdf0696657643a4f38a7390e80482d4e593
+  data.tar.gz: a0a4faea1a82f25605d71e145eee3251cfc4dfe42aa7ec48726c5aaaf2a1f567e473d0f49f5541a2d26e3c6da5a3fbd987647be36c18cd37a4872809277419d2

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,11 +13,17 @@ 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)
-      package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host)
+      if (has_aio = collection != 'none')
+        BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, collection)
+      end
+      package_name = BeakerPuppetHelpers::InstallUtils.puppet_package_name(host, prefer_aio: has_aio)
       host.install_package(package_name)
+
+      # by default, puppet-agent creates /etc/profile.d/puppet-agent.sh which adds /opt/puppetlabs/bin to PATH
+      # in our non-interactive ssh sessions we manipulate PATH in ~/.ssh/environment, we need to do this step here as well
+      host.add_env_var('PATH', '/opt/puppetlabs/bin')
     end
   end
 

metadata

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