Merge pull request #724 from justinstoller/maint/master/set-puppet-version

(maint) allow setting PUPPET_VERSION in acceptance
This commit is contained in:
Morgan Haskel 2015-06-09 15:03:10 -07:00
commit 2a9ff96e02

View file

@ -5,7 +5,10 @@ UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
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