X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fspec_helper_acceptance.rb;h=3352564ce7b553672fab7dafa8f277af232a065f;hb=60e50a9b65dec94fe20734404295e28d9e434a83;hp=0073e4d8da0ac1d68574410e2ba972cc483fbebb;hpb=51350aaaf1846c2ac15cac058cf2ef189cf20642;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 0073e4d..3352564 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,12 +1,19 @@ require 'beaker-rspec' -hosts.each do |host| - # Install Puppet - install_package host, 'rubygems' - on host, 'gem install puppet --no-ri --no-rdoc' - on host, "mkdir -p #{host['distmoduledir']}" +# Install Puppet +unless ENV['RS_PROVISION'] == 'no' + hosts.each do |host| + if host.is_pe? + install_pe + else + install_puppet + on host, "mkdir -p #{host['distmoduledir']}" + end + end end +UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris'] + RSpec.configure do |c| # Project root proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) @@ -20,7 +27,7 @@ RSpec.configure do |c| puppet_module_install(:source => proj_root, :module_name => 'apt') hosts.each do |host| shell('/bin/touch /etc/puppet/hiera.yaml') - shell('puppet module install puppetlabs-stdlib', { :acceptable_exit_codes => [0,1] }) + shell('puppet module install puppetlabs-stdlib --version 2.2.1', { :acceptable_exit_codes => [0,1] }) end end end