diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-04-01 10:29:02 -0700 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-04-01 10:29:02 -0700 |
| commit | a1f5ea940d43601106e6a660771145f2e74d0584 (patch) | |
| tree | efb8cae59798ac269afc5352f7807f5bce9bd93d | |
| parent | 15e3c65c1e77ef1046d881fa7d4d950e010d1677 (diff) | |
| parent | 0eafb427a871f688a583419b85cb98132ff607e8 (diff) | |
| download | chef-a1f5ea940d43601106e6a660771145f2e74d0584.tar.gz | |
Merge pull request #4778 from chef/new_tk
use test-kitchen from master for acceptance tests
| -rw-r--r-- | acceptance/Gemfile | 5 | ||||
| -rw-r--r-- | omnibus/Gemfile | 4 |
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 432145114c..01de554d37 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -20,9 +20,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" |