diff options
| author | Travis Fields <cyberious@users.noreply.github.com> | 2015-05-07 12:00:17 -0700 |
|---|---|---|
| committer | Travis Fields <cyberious@users.noreply.github.com> | 2015-05-07 12:00:17 -0700 |
| commit | 4cc3383f3e22edb31a03a3dad7817734529781ee (patch) | |
| tree | 23cc218d73cda7ceb383c7bbfbb998bfa1ad76db | |
| parent | b02a409d141e70b93fe39df84ec3217cbb60ec0f (diff) | |
| parent | e9ff63ed456fb981bc87a52057ec8e70270954f4 (diff) | |
| download | puppet-vcsrepo-4cc3383f3e22edb31a03a3dad7817734529781ee.tar.gz puppet-vcsrepo-4cc3383f3e22edb31a03a3dad7817734529781ee.tar.bz2 | |
Merge pull request #247 from puppetlabs/modulesync_updates
Modulesync updates
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Gemfile | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 0fc75e3..291ceb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,13 @@ script: "bundle exec rake spec SPEC_OPTS='--format documentation'" matrix: fast_finish: true include: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 3.4.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.5 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.1.5 - env: PUPPET_GEM_VERSION="~> 3.4.0" - - rvm: 2.1.5 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" @@ -18,13 +18,11 @@ group :development, :unit_tests do gem 'json', :require => false end -beaker_version = ENV['BEAKER_VERSION'] -beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] group :system_tests do - if beaker_version + if beaker_version = ENV['BEAKER_VERSION'] gem 'beaker', *location_for(beaker_version) end - if beaker_rspec_version + if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] gem 'beaker-rspec', *location_for(beaker_rspec_version) else gem 'beaker-rspec', :require => false @@ -32,6 +30,8 @@ group :system_tests do gem 'serverspec', :require => false end + + if facterversion = ENV['FACTER_GEM_VERSION'] gem 'facter', facterversion, :require => false else |