Merge pull request #37 from chef/chris-rock/integration-travis

activate integration tests in travis
inspec · Dec 7, 2015 · b906a0e · b906a0e
2 parents 158e2a4 + ec5260a
commit b906a0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -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
@@ -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
diff --git a/Gemfile b/Gemfile
@@ -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