diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-11-12 11:54:41 -0800 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-11-12 11:54:41 -0800 |
commit | b80c432ab9de2536aab099e5d5b3baf9e883bc68 (patch) | |
tree | beaf5f625bb672bcf57cfe9e06534fb4250eba38 /spec/spec_helper_acceptance.rb | |
parent | 85d7eddc41b04c9a9a7bf1a171dd8d3ab157a88a (diff) | |
parent | ded4d516f15443ef145d64ef5e2b198578f6a190 (diff) | |
download | puppet-stdlib-b80c432ab9de2536aab099e5d5b3baf9e883bc68.tar.gz puppet-stdlib-b80c432ab9de2536aab099e5d5b3baf9e883bc68.tar.bz2 |
Merge pull request #366 from mhaskel/merge_4.4.x
Merge 4.4.x
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rwxr-xr-x | spec/spec_helper_acceptance.rb | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index ef99723..3203ce9 100755 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -4,15 +4,23 @@ require 'beaker-rspec' UNSUPPORTED_PLATFORMS = [] 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' } + foss_opts = { + :default_action => 'gem_install', + :version => (ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : '3.7.2'), + } if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end hosts.each do |host| - on host, "mkdir -p #{host['distmoduledir']}" - on host, "/bin/touch #{host['puppetpath']}/hiera.yaml" + if host['platform'] !~ /windows/i + if host.is_pe? + on host, 'mkdir -p /etc/puppetlabs/facter/facts.d' + else + on host, "/bin/touch #{host['puppetpath']}/hiera.yaml" + on host, "mkdir -p #{host['distmoduledir']}" + on host, 'mkdir -p /etc/facter/facts.d' + end + end end end @@ -29,17 +37,8 @@ RSpec.configure do |c| default[:default_apply_opts] ||= {} default[:default_apply_opts].merge!({:parser => 'future'}) end - hosts.each do |host| - if host['platform'] !~ /windows/i - copy_root_module_to(host, :source => proj_root, :module_name => 'stdlib') - end - end - hosts.each do |host| - if host['platform'] =~ /windows/i - on host, puppet('plugin download') - end - end + copy_root_module_to(default, :source => proj_root, :module_name => 'stdlib') end end |