diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 0c5cf50fa..0dd71f19c 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,27 +1,8 @@ require 'beaker-rspec/spec_helper' require 'beaker-rspec/helpers/serverspec' +require 'beaker/puppet_installer_helper' -unless ENV['RS_PROVISION'] == 'no' - # This will install the latest available package on el and deb based - # systems fail on windows and osx, and install via gem on other *nixes - foss_opts = { - :default_action => 'gem_install', - :version => (ENV['PUPPET_VERSION'] || '3.8.1'), - } - - if default.is_pe?; then - install_pe; - else - install_puppet(foss_opts); - end - - hosts.each do |host| - if host['platform'] =~ /debian/ - on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc' - on host, "mkdir -p #{host['distmoduledir']}" - end - end -end +run_puppet_install_helper RSpec.configure do |c| # Project root