activate integration tests in travis

inspec · Dec 7, 2015 · e6a01ef · e6a01ef
1 parent f7213d3
commit e6a01ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,13 @@
 ---
+sudo: required
 language: ruby
 cache: bundler
 
+# necessary for docker to work
+dist: trusty
+services:
+  - docker
+
 matrix:
   include:
   - rvm: 1.9.3
@@ -10,3 +16,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
@@ -11,6 +11,7 @@ group :test do
 end
 
 group :integration do
+  gem 'berkshelf', '~> 4.0'
   gem 'test-kitchen', '~> 1.4'
   gem 'kitchen-vagrant'
   gem 'concurrent-ruby', '~> 0.9'