Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

activate integration tests in travis #37

Merged
merged 3 commits into from
Dec 7, 2015
Merged

activate integration tests in travis #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1c375f
activate integration tests in travis
chris-rock Dec 7, 2015
168f778
make integration section in gemfile optional to travis
arlimus Dec 7, 2015
ec5260a
move concurrent-ruby gem to test group
chris-rock Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
---
sudo: required
language: ruby
cache: bundler

# necessary for docker to work
dist: trusty
services:
- docker

bundler_args: --without integration tools

matrix:
include:
- rvm: 1.9.3
Expand All @@ -10,3 +18,6 @@ matrix:
gemfile: Gemfile
- rvm: 2.2
gemfile: Gemfile
- rvm: 2.2
gemfile: Gemfile
script: bundle exec rake test:docker config=test/integration/test-runner.yaml
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ group :test do
gem 'rake', '~> 10'
gem 'rubocop', '~> 0.33.0'
gem 'simplecov', '~> 0.10'
gem 'concurrent-ruby', '~> 0.9'
end

group :integration do
gem 'berkshelf', '~> 4.0'
gem 'test-kitchen', '~> 1.4'
gem 'kitchen-vagrant'
gem 'concurrent-ruby', '~> 0.9'
end

group :tools do
Expand Down