From dda9beae83f0dea73a56ec9735daca6813f9b151 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 16 Oct 2023 14:43:27 +0200 Subject: [PATCH] Pass AIO preference to package name selection --- lib/voxpupuli/acceptance/spec_helper_acceptance.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/voxpupuli/acceptance/spec_helper_acceptance.rb b/lib/voxpupuli/acceptance/spec_helper_acceptance.rb index dea6ee8..6b25d8c 100644 --- 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