Merge branch 'docker-on-travis'

.kitchen.docker.yml

@@ -43,7 +43,7 @@ platforms:
   - name: centos-6.4
     driver_config:
       provision_command:
-        - yum install -y tar java-1.7.0-openjdk java-1.7.0-openjdk-devel
+        - yum install -y tar java-1.7.0-openjdk
         - curl -L https://chef.io/chef/install.sh | bash -s -- -v <%= ENV.fetch('CHEF_VERSION', '11.16.4') %>
   - name: debian-7.4
     driver_config:
@@ -53,7 +53,7 @@ platforms:
   - name: ubuntu-14.04
     driver_config:
       provision_command:
-        - apt-get install -y openjdk-7-jre-headless
+        - apt-get install -y default-jre-headless
         - curl -L https://chef.io/chef/install.sh | bash -s -- -v <%= ENV.fetch('CHEF_VERSION', '11.16.4') %>
 suites:
   - name: default

.travis.yml

@@ -1,13 +1,28 @@
 language: ruby
-script: bundle exec rake test
-sudo: false
+sudo: required
+services:
+  - docker
 cache:
   - bundler
 rvm:
   - 2.1
+env:
+  global:
+    - KITCHEN_YAML=.kitchen.docker.yml
+  matrix:
+    - CHEF_VERSION=11
+    - CHEF_VERSION=12
+install: travis_wait bundle install --jobs=3 --retry=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
+script: bundle exec kitchen test --concurrency=3 --destroy=always
 matrix:
   fast_finish: true
   include:
-    - rvm: 1.9
+    - sudo: false
+      env: []
+      rvm: 2.1
+      script: bundle exec rake test
+    - sudo: false
+      env: []
+      rvm: 1.9
       gemfile: gemfiles/chef-11/Gemfile
       script: bundle exec rspec spec