Skip to content

Commit

Permalink
Merge pull request #1136 from justinstoller/maint/master/set_puppet_v…
Browse files Browse the repository at this point in the history
…ersion

(maint) allow specifying PUPPET_VERSION in acceptance
  • Loading branch information
DavidS committed Jun 9, 2015
2 parents 4de97c3 + e58cf45 commit 71ccd39
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
unless ENV['RS_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

Expand Down

0 comments on commit 71ccd39

Please sign in to comment.