opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Have Travis actually test Facter 1.6/1.7

Browse source 
The Gemfile didn't actually specify which version to use for Facter,
even when there was an environment variable to that effect.
This commit is contained in:
Eli Young 2015-02-12 11:43:34 -08:00
parent 8524a17e0f
commit f9855d99ec
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -25,8 +25,14 @@ group :system_tests do
gem 'serverspec', :require => false gem 'serverspec', :require => false
end end
ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION'] facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
puppetversion = ENV['GEM_PUPPET_VERSION'] if facterversion
gem 'facter', *location_for(facterversion)
else
gem 'facter', :require => false
end
puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
if puppetversion if puppetversion
gem 'puppet', *location_for(puppetversion) gem 'puppet', *location_for(puppetversion)
else else