From cdb620a3cda4f80d584acd39afbb94fe28150aa6 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 19 Oct 2019 15:22:51 +0200 Subject: [PATCH] Clean up acceptance spec helper --- spec/spec_helper_acceptance.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 4a9324709..8ce287aa0 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,20 +3,21 @@ require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' -UNSUPPORTED_PLATFORMS = [].freeze - -run_puppet_install_helper -install_module -install_module_dependencies - -# Install aditional modules for soft deps -install_module_from_forge('puppetlabs-apt', '>= 4.1.0 < 8.0.0') if fact('os.family') == 'Debian' -install_module_from_forge('garethr-erlang', '>= 0.3.0 < 1.0.0') if fact('os.family') == 'RedHat' +run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no' RSpec.configure do |c| # Readable test descriptions c.formatter = :documentation + + # Configure all nodes in nodeset c.before :suite do + install_module + install_module_dependencies + + # Install aditional modules for soft deps + install_module_from_forge('puppetlabs-apt', '>= 4.1.0 < 8.0.0') if fact('os.family') == 'Debian' + install_module_from_forge('garethr-erlang', '>= 0.3.0 < 1.0.0') if fact('os.family') == 'RedHat' + hosts.each do |host| install_package(host, 'iproute2') if fact('os.release.major').to_i == 18 || fact('os.release.major') == 'buster/sid' if fact('os.family') == 'RedHat' && fact('selinux') == 'true'