summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-03-31 16:21:28 -0700
committerMatt Wrock <matt@mattwrock.com>2016-03-31 16:21:28 -0700
commit0eafb427a871f688a583419b85cb98132ff607e8 (patch)
tree40c997e34ad7303450434b8104b9456d1e4df8ab
parentb57dbc4bf35a00edbd4cf016dd4ec97fa46553e2 (diff)
downloadchef-new_tk.tar.gz
use test-kitchen from master for acceptance testsnew_tk
-rw-r--r--acceptance/Gemfile5
-rw-r--r--omnibus/Gemfile4
2 files changed, 4 insertions, 5 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 4573bc5fb3..87614ae202 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -1,8 +1,7 @@
source "https://rubygems.org"
-gem "mixlib-install", github: "chef/mixlib-install"
gem "chef-acceptance", github: "chef/chef-acceptance"
-gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update"
+gem "test-kitchen", github: "test-kitchen/test-kitchen"
gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only"
gem "kitchen-inspec"
gem "inspec"
@@ -10,5 +9,5 @@ gem "inspec"
# puts in a box_url for bento when a vagrant box in atlas is specified
gem "kitchen-vagrant", github: "test-kitchen/kitchen-vagrant"
gem "windows_chef_zero"
-gem "winrm-transport"
+gem "winrm-fs", "~> 0.4.0"
gem "berkshelf"
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 07d1e0c9f3..0b076825fc 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -16,9 +16,9 @@ group :development do
gem "berkshelf", "~> 3.0"
# Use Test Kitchen with Vagrant for converging the build environment
- gem "test-kitchen", "~> 1.5.0"
+ gem "test-kitchen", "~> 1.6.0"
gem "kitchen-vagrant", "~> 0.19.0"
- gem "winrm-transport", "~> 1.0"
+ gem "winrm-fs", "~> 0.3.2"
gem "pry"
gem "pry-byebug"
gem "pry-stack_explorer"