From 5e0b5ba0e126c10984cbf736981f50d5a335fa6c Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Wed, 22 Apr 2015 08:39:14 -0700 Subject: [PATCH] update spec_helper_acceptance.rb to latest boilerplate --- spec/spec_helper_acceptance.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 0ebf390..7e84198 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,11 +3,16 @@ require 'spec_helper_common' unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' - if hosts.first.is_pe? - install_pe + # 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'} + + if default.is_pe?; then + install_pe; else - install_puppet + install_puppet(foss_opts); end + hosts.each do |host| on hosts, "mkdir -p #{host['distmoduledir']}" end @@ -25,10 +30,10 @@ # Install module and dependencies puppet_module_install(:source => proj_root, :module_name => 'selenium') hosts.each do |host| - on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0,1] } + on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0, 1] } + on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0, 1] } + on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0, 1] } + on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0, 1] } end end end