X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fspec_helper_acceptance.rb;h=409ce68b299d2ff4b302ab2e46726d26643017d0;hb=a09dcafb3253aaddc1c6a69a85afef1e35a7fea1;hp=7e0de22e28ca8ccb301de7637b0986719b3bf962;hpb=8fa73ac96fda8af4360e71b41c0a3e514f28080a;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 7e0de22..409ce68 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,16 +1,7 @@ require 'beaker-rspec' +require 'beaker/puppet_install_helper' -# Install Puppet -unless ENV['RS_PROVISION'] == 'no' - hosts.each do |host| - if host.is_pe? - install_pe - else - install_puppet - on host, "mkdir -p #{host['distmoduledir']}" - end - end -end +run_puppet_install_helper UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris'] @@ -27,7 +18,7 @@ RSpec.configure do |c| hosts.each do |host| copy_module_to(host, :source => proj_root, :module_name => 'apt') shell("/bin/touch #{default['puppetpath']}/hiera.yaml") - shell('puppet module install puppetlabs-stdlib --version 2.2.1', { :acceptable_exit_codes => [0,1] }) + on host, puppet('module install puppetlabs-stdlib --version 4.5.0'), { :acceptable_exit_codes => [0,1] } end end end