diff options
| author | Colleen Murphy <cmurphy@users.noreply.github.com> | 2015-02-12 13:14:17 -0800 |
|---|---|---|
| committer | Colleen Murphy <cmurphy@users.noreply.github.com> | 2015-02-12 13:14:17 -0800 |
| commit | afc83ea564520378ac507251ddfea46f8d571829 (patch) | |
| tree | 37247e2b5623dbd2738d50112d5c8304b7f0c311 | |
| parent | 5863ab3901368310186790980aea2b0bf7cecb06 (diff) | |
| parent | f9855d99ec117d336aa3860e2118f29ddfd10c35 (diff) | |
| download | puppet-stdlib-afc83ea564520378ac507251ddfea46f8d571829.tar.gz puppet-stdlib-afc83ea564520378ac507251ddfea46f8d571829.tar.bz2 | |
Merge pull request #411 from elyscape/fix/travis_build_issues
Fix Travis builds
| -rw-r--r-- | Gemfile | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -12,6 +12,7 @@ end group :development, :unit_tests do gem 'rake', '~> 10.1.0', :require => false + gem 'rspec', '~> 3.1.0', :require => false gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false @@ -24,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 |