Skip to content

Commit

Permalink
Simplify travis matrix
Browse files Browse the repository at this point in the history
Drop all old puppets besides latest 3.x and 4.x.  Add a cell to run the
acceptance tests in docker.
  • Loading branch information
richardc committed Jun 21, 2017
1 parent 4285f6a commit cf6733e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
30 changes: 17 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
---
sudo: false
language: ruby
bundler_args: --without development
before_install:
- gem update bundler
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
- 1.9.3
env:
- PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
- PUPPET_GEM_VERSION="~> 3.3.0"
- PUPPET_GEM_VERSION="~> 3.4.0"
- PUPPET_GEM_VERSION="~> 3.5.0"
- PUPPET_GEM_VERSION="~> 3.6.0"
- PUPPET_GEM_VERSION="~> 3.7.0"
matrix:
fast_finish: true
include:
- rvm: 2.3.1
script: bundle exec kitchen test
services: docker
sudo: required
- rvm: 1.9.3
bundler_args: --without integration
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.3.1
bundler_args: --without integration
env: PUPPET_GEM_VERSION="~> 4.0"
notifications:
email: false
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ group :development, :test do
gem 'puppet-lint'
end

group :development do
group :integration do
gem 'test-kitchen'
gem 'kitchen-docker'
gem 'kitchen-inspec'
Expand Down

0 comments on commit cf6733e

Please sign in to comment.