diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2015-06-09 15:04:35 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2015-06-09 15:04:35 -0700 |
| commit | 69c9fc6c5c794f829b9c68b546277ae0081c8329 (patch) | |
| tree | c0086627a97009cca949bb2e5c502b4e357197b2 /spec | |
| parent | 18b91b2f51a1cd8cd6911bd981e4629dd0d407e8 (diff) | |
| parent | a37c388f1b4c7b2d3db12fefe35261d067486f9f (diff) | |
| download | puppet-vcsrepo-69c9fc6c5c794f829b9c68b546277ae0081c8329.tar.gz puppet-vcsrepo-69c9fc6c5c794f829b9c68b546277ae0081c8329.tar.bz2 | |
Merge pull request #253 from justinstoller/maint/master/set-puppet-version
(maint) allow setting PUPPET_VERSION in acceptance
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper_acceptance.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 9ef826a..78074f7 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,7 +3,10 @@ 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' } + foss_opts = { + :default_action => 'gem_install', + :version => (ENV['PUPPET_VERSION'] || '3.8.1'), + } if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end |