summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-05-11 18:24:14 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-05-11 18:24:14 -0700
commitd77f4ae08963336e65314f22fe0d8f9e01ca1fd0 (patch)
tree7d8fd6ed9b950ae69c380cf21ee15e3374b426af /kitchen-tests
parentfbbcbd699ed1bf44ad36bb6acc782797479f6466 (diff)
downloadchef-d77f4ae08963336e65314f22fe0d8f9e01ca1fd0.tar.gz
fix a few issues in the diff
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/.kitchen.travis.yml2
-rw-r--r--kitchen-tests/Gemfile2
-rw-r--r--kitchen-tests/Gemfile.lock2
3 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 2f935812dc..b8c486105b 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -8,7 +8,7 @@ driver:
instance_type: "m3.medium"
provisioner:
- name: chef_zero
+ name: chef_github
chef_omnibus_url: "https://omnitruck.chef.io/current/install.sh"
chef_omnibus_install_options: "-n"
github_owner: "chef"
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 6c11948730..acc62156ae 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
group :end_to_end do
gem "berkshelf"
- gem "test-kitchen"
+ gem "test-kitchen", "~> 1.4"
gem "kitchen-appbundle-updater"
gem "kitchen-vagrant", "~> 0.17"
gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index ca09e00496..69c23ad156 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -166,7 +166,7 @@ DEPENDENCIES
kitchen-appbundle-updater
kitchen-ec2!
kitchen-vagrant (~> 0.17)
- test-kitchen
+ test-kitchen (~> 1.4)
vagrant-wrapper
BUNDLED WITH