Skip to content

Commit 4069e79

Browse files
committed
Add the helper to install puppet/pe/puppet-agent
1 parent 84219d8 commit 4069e79

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ group :system_tests do
2828
gem 'beaker-rspec', :require => false
2929
end
3030
gem 'serverspec', :require => false
31+
gem 'beaker-puppet_install_helper', :require => false
3132
end
3233

3334

spec/spec_helper_acceptance.rb

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
require 'beaker-rspec/spec_helper'
22
require 'beaker-rspec/helpers/serverspec'
3+
require 'beaker/puppet_install_helper'
34

4-
5-
unless ENV['RS_PROVISION'] == 'no'
6-
# This will install the latest available package on el and deb based
7-
# systems fail on windows and osx, and install via gem on other *nixes
8-
foss_opts = {
9-
:default_action => 'gem_install',
10-
:version => (ENV['PUPPET_VERSION'] || '3.8.1'),
11-
}
12-
13-
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
14-
15-
hosts.each do |host|
16-
if host['platform'] =~ /debian/
17-
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
18-
end
19-
20-
on host, "mkdir -p #{host['distmoduledir']}"
21-
end
22-
end
5+
run_puppet_install_helper
236

247
UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
258

0 commit comments

Comments
 (0)