diff options
| author | Eric Putnam <putnam.eric@gmail.com> | 2017-01-18 16:53:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 16:53:59 -0800 |
| commit | 7ef19c6676b0f7fdb3f6db183b1949b5c7a0dfd3 (patch) | |
| tree | 011c8727b5f350373f62d84152f02498ea156d93 | |
| parent | e8cab901d51f96d425961de3e3e3e183efa4b047 (diff) | |
| parent | fc7f4af4c84b426b111a302dbf9ae19d991c787b (diff) | |
Merge pull request #706 from puppetlabs/hunner_msync
(MODULES-4097) Sync travis.yml
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | Gemfile | 1 |
2 files changed, 3 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index d972387..4981b25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: ruby cache: bundler -script: "bundle exec rake validate lint spec" +script: "bundle exec rake release_checks" #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203 before_install: - gem update bundler @@ -25,17 +25,8 @@ matrix: - rvm: 2.3.1 bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.1.9 + - rvm: 2.1.7 bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.1.5 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - - rvm: 2.1.5 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 1.9.3 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 3.0" notifications: email: false @@ -59,6 +59,7 @@ group :system_tests do gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') if ! supports_windows gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1') if supports_windows gem 'beaker-puppet_install_helper', :require => false + gem 'beaker-module_install_helper', :require => false gem 'master_manipulator', :require => false gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') |