Skip to content

Commit

Permalink
Have Travis actually test Facter 1.6/1.7
Browse files Browse the repository at this point in the history
The Gemfile didn't actually specify which version to use for Facter,
even when there was an environment variable to that effect.
  • Loading branch information
elyscape committed Feb 12, 2015
1 parent 8524a17 commit f9855d9
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,14 @@ group :system_tests do
gem 'serverspec', :require => false
end

ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
puppetversion = ENV['GEM_PUPPET_VERSION']
facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_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
gem 'puppet', *location_for(puppetversion)
else
Expand Down

0 comments on commit f9855d9

Please sign in to comment.