Merge pull request #70 from ekohl/pass-aio-preference

Pass AIO preference to package name selection
voxpupuli · Oct 17, 2023 · dcfc45a · dcfc45a
2 parents b7f8f37 + dda9bea
commit dcfc45a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/voxpupuli/acceptance/spec_helper_acceptance.rb b/lib/voxpupuli/acceptance/spec_helper_acceptance.rb
@@ -15,8 +15,10 @@ def configure_beaker(modules: :metadata, &block)
 
   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)
+      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