Skip to content

Commit

Permalink
Update vcsrepo to 69c9fc6c5c794f829b9c68b546277ae0081c8329
Browse files Browse the repository at this point in the history
69c9fc6c5c794f829b9c68b546277ae0081c8329 Merge pull request redhat-openstack#253 from justinstoller/maint/master/set-puppet-version
a37c388f1b4c7b2d3db12fefe35261d067486f9f (maint) allow setting PUPPET_VERSION in acceptance

Change-Id: I860faa03ea8eed27426e56e1555766f74358487d
  • Loading branch information
xbezdick committed Jun 15, 2015
1 parent a337769 commit 91051d4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ mod 'tuskar',
:git => 'https://github.com/stackforge/puppet-tuskar.git'

mod 'vcsrepo',
:commit => '18b91b2f51a1cd8cd6911bd981e4629dd0d407e8',
:commit => '69c9fc6c5c794f829b9c68b546277ae0081c8329',
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'

mod 'vlan',
Expand Down
5 changes: 4 additions & 1 deletion vcsrepo/spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
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

Expand Down

0 comments on commit 91051d4

Please sign in to comment.