Skip to content

Commit 5e0b5ba

Browse files
committed
update spec_helper_acceptance.rb to latest boilerplate
1 parent 9e307e1 commit 5e0b5ba

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

spec/spec_helper_acceptance.rb

+12-7
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33
require 'spec_helper_common'
44

55
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
6-
if hosts.first.is_pe?
7-
install_pe
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 = {:default_action => 'gem_install'}
9+
10+
if default.is_pe?; then
11+
install_pe;
812
else
9-
install_puppet
13+
install_puppet(foss_opts);
1014
end
15+
1116
hosts.each do |host|
1217
on hosts, "mkdir -p #{host['distmoduledir']}"
1318
end
@@ -25,10 +30,10 @@
2530
# Install module and dependencies
2631
puppet_module_install(:source => proj_root, :module_name => 'selenium')
2732
hosts.each do |host|
28-
on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
29-
on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0,1] }
30-
on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0,1] }
31-
on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0,1] }
33+
on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0, 1] }
34+
on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0, 1] }
35+
on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0, 1] }
36+
on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0, 1] }
3237
end
3338
end
3439
end

0 commit comments

Comments
 (0)