From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Sun, 14 Jun 2015 18:17:27 +0000 (+0200)
Subject: Merge pull request #532 from hunner/add_helper
X-Git-Tag: 2.1.1~2^2^2~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d86edc66c817e13976b7849d077db28e45f33f4b;hp=ee230d111b7aa87607d757b2822e658af700b6ab;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #532 from hunner/add_helper

Add helper to install puppet/pe/puppet-agent
---

diff --git a/Gemfile b/Gemfile
index b3facaa..643d3f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,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 f1e1161..409ce68 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,20 +1,7 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
-# Install Puppet
-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|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+run_puppet_install_helper
 
 UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris']