Skip to content

Commit f70c81c

Browse files
author
mhaskel
committed
Merge pull request #507 from apenney/fix-1404
Improve this so it works on Ubuntu 14.04.
2 parents 467017a + 81a1a19 commit f70c81c

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

spec/spec_helper_acceptance.rb

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
44

5-
unless ENV['RS_PROVISION'] == 'no'
5+
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
6+
if hosts.first.is_pe?
7+
install_pe
8+
else
9+
install_puppet
10+
end
611
hosts.each do |host|
7-
# Install Puppet
8-
if host.is_pe?
9-
install_pe
10-
else
11-
install_package host, 'rubygems'
12-
on host, 'gem install puppet --no-ri --no-rdoc'
13-
on host, "mkdir -p #{host['distmoduledir']}"
14-
end
12+
on hosts, "mkdir -p #{host['distmoduledir']}"
1513
end
1614
end
1715

0 commit comments

Comments
 (0)