Use beaker-puppet_install_helper to install puppet

When running with BEAKER_provision=no, the following happens:

In Trusty: beaker is running dpkg with '--force' option so even
if Puppet is already installed, the return code will be 0.
In CentOS: beaker is running 'rpm -ivh' the second time and since
the package is already here, the return code will be 1.

Using the new puppet install helper will abort installing puppet
if BEAKER_provision is no, so tests will continue as normal.

Change-Id: Ifeada55370bbd5b30418447c8fc1da101de2b774
Co-Authored-By: Colleen Murphy <colleen@gazlene.net>

diff --git a/Gemfile b/Gemfile
index 3c0b875308ef6fc12ba0d1ba4e8edfbc65f59ad2..9ea21133312f5d50a3c2277e549303c37035bc13 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ group :development, :test do
   gem 'puppet-lint-numericvariable'
 
   gem 'beaker-rspec', :require => false
+  gem 'beaker-puppet_install_helper', :require => false
   gem 'json'
   gem 'webmock'
 end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 2a02a6dc72a18c402bcbbe9655a0af7ef844e919..23eaaf103074b080dbe064df85aa77aac9f6ec00 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,11 +1,7 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
-hosts.each do |host|
-
-  install_puppet
-
-  on host, "mkdir -p #{host['distmoduledir']}"
-end
+run_puppet_install_helper
 
 RSpec.configure do |c|
   # Project root