From ef3cb5df8573915ee0530548e1a25ceffbe6b125 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 11 Jun 2015 15:30:49 -0700
Subject: [PATCH] Add helper to install puppet/pe/puppet-agent

---
 spec/spec_helper_acceptance.rb | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 4e2c457f..49525729 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,23 +1,9 @@
 require 'beaker-rspec'
+require 'beaker/puppet_installer_helper'
 
-UNSUPPORTED_PLATFORMS = ['Darwin', 'Suse','windows','AIX','Solaris']
-
-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|
-    on host, "mkdir -p #{host['distmoduledir']}"
-    # Windows doesn't have a hieraconf variable
-    on host, "touch #{host['hieraconf']}" if fact('osfamily') != 'windows'
-  end
-end
+UNSUPPORTED_PLATFORMS = ['Darwin', 'Suse','windows','AIX','Solaris']
 
 RSpec.configure do |c|
   # Project root