Merge pull request #150 from mhaskel/fix-1404

Fix spec_helper_acceptance to work on Ubuntu 14.04.
puppetlabs · May 2, 2014 · 23acfa4 · 23acfa4
2 parents f86f8da + a7a724e
commit 23acfa4
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -2,16 +2,14 @@
 
 UNSUPPORTED_PLATFORMS = [ 'windows', 'Solaris' ]
 
-unless ENV['RS_PROVISION'] == 'no'
+unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
+  if hosts.first.is_pe?
+    install_pe
+  else
+    install_puppet
+  end
   hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
+    on hosts, "mkdir -p #{host['distmoduledir']}"
   end
 end