Add helper to install puppet/pe/puppet-agent

diff --git a/Gemfile b/Gemfile
index 2b1b7cd8d9361b28aa7bdd31884bb901a22eb0d4..bfe64b186a6fe4cf56aec869ba119d2174b1607c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 56f896143f17cecc20df77d09914522076353c14..942332e1dc5460d4eda68eaa465b2ea02d6f2334 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,4 +1,5 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
 def iptables_flush_all_tables
   ['filter', 'nat', 'mangle', 'raw'].each do |t|
@@ -27,20 +28,7 @@ def is_rhel7(osfamily, operatingsystem, operatingsystemrelease)
   end
 end
 
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_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|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+run_puppet_install_helper
 
 UNSUPPORTED_PLATFORMS = ['windows','Solaris','Darwin']