diff options
| author | Morgan Haskel <morgan@puppetlabs.com> | 2014-08-28 18:46:41 -0400 |
|---|---|---|
| committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-08-28 18:46:41 -0400 |
| commit | fc07485e8b33ba4c8280900f72104e489151dec8 (patch) | |
| tree | 6f5e12aeaf624490b2f1c72f27d2514d3351f5cb | |
| parent | 177618e2ccdd610890e04502923b39a61f7cb40a (diff) | |
| download | puppet-vcsrepo-fc07485e8b33ba4c8280900f72104e489151dec8.tar.gz puppet-vcsrepo-fc07485e8b33ba4c8280900f72104e489151dec8.tar.bz2 | |
Update spec_helper for more consistency
| -rw-r--r-- | spec/spec_helper_acceptance.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index d37c169..8ca20a8 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,12 +1,14 @@ require 'beaker-rspec' unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' + # 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( foss_opts ); end + hosts.each do |host| - # Install Puppet - if host.is_pe? - install_pe - else - install_puppet + unless host.is_pe? on hosts, "mkdir -p #{hosts.first['distmoduledir']}" end |