summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2015-06-15 10:30:28 -0700
committerBryan Jen <bryan.jen@gmail.com>2015-06-15 10:30:28 -0700
commit11b91fbaa94242691ff00913a025425f5488ea33 (patch)
treec6740a7d68cc7a2f8410ec9d0f816df631a1e340
parent69c9fc6c5c794f829b9c68b546277ae0081c8329 (diff)
parent153b27bef2cc146465938a7a168da5ebe439c9f8 (diff)
downloadpuppet-vcsrepo-11b91fbaa94242691ff00913a025425f5488ea33.tar.gz
puppet-vcsrepo-11b91fbaa94242691ff00913a025425f5488ea33.tar.bz2
Merge pull request #254 from hunner/add_helper
Add helper to install puppet/pe/puppet-agent
-rw-r--r--Gemfile1
-rw-r--r--spec/spec_helper_acceptance.rb25
2 files changed, 3 insertions, 23 deletions
diff --git a/Gemfile b/Gemfile
index 2b1b7cd..bfe64b1 100644
--- 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 78074f7..97c43e8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,28 +1,7 @@
require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
-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|
- unless host.is_pe?
- on hosts, "mkdir -p #{hosts.first['distmoduledir']}"
- end
-
- # We ask the host to interpolate it's distmoduledir because we don't
- # actually know it on Windows until we've let it redirect us (depending
- # on whether we're running as a 32/64 bit process on 32/64 bit Windows
- moduledir = on(host, "echo #{host['distmoduledir']}").stdout.chomp
- on host, "mkdir -p #{moduledir}"
- end
-end
-
+run_puppet_install_helper
RSpec.configure do |c|
# Project root