Merge pull request #124 from hunner/add_helper

Add helper to install puppet/pe/puppet-agent

Author: bmjen

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
 
 

spec/spec_helper_acceptance.rb

@@ -1,33 +1,10 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
+require 'beaker/puppet_install_helper'
 
-UNSUPPORTED_PLATFORMS = []
-
-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
+run_puppet_install_helper
 
-  hosts.each do |host|
-    if not host.is_pe? and host['platform'] !~ /windows/i
-      on host, 'puppet master'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    elsif host["platform"] =~ /solaris/
-      on host, "echo 'export PATH=/opt/puppet/bin:/var/ruby/1.8/gem_home/bin:${PATH}' >> ~/.bashrc"
-    elsif host.is_pe?
-      on host, "echo 'export PATH=#{host['puppetbindir']}:${PATH}' >> ~/.bashrc"
-    end
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+UNSUPPORTED_PLATFORMS = []
 
 def create_keys_for_test(host)
   # Generate private key and CA for keystore