diff options
| author | Salim Alam <salam@chef.io> | 2016-04-04 15:49:20 -0700 |
|---|---|---|
| committer | Salim Alam <salam@chef.io> | 2016-04-04 15:49:20 -0700 |
| commit | 3a0c531c013fac6b8f0a712066e5172cf494b133 (patch) | |
| tree | 41b439fa80cc4b12c3fafecfdda9c33a613d16ec | |
| parent | b99c65f2e159923dc13786b3677c329cdfc3628a (diff) | |
| download | chef-salam/test-revert.tar.gz | |
Revert "use test-kitchen from master for acceptance tests"salam/test-revert
This reverts commit 0eafb427a871f688a583419b85cb98132ff607e8.
| -rw-r--r-- | acceptance/Gemfile | 5 | ||||
| -rw-r--r-- | omnibus/Gemfile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 87614ae202..4573bc5fb3 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -1,7 +1,8 @@ source "https://rubygems.org" +gem "mixlib-install", github: "chef/mixlib-install" gem "chef-acceptance", github: "chef/chef-acceptance" -gem "test-kitchen", github: "test-kitchen/test-kitchen" +gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update" gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only" gem "kitchen-inspec" gem "inspec" @@ -9,5 +10,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-fs", "~> 0.4.0" +gem "winrm-transport" gem "berkshelf" diff --git a/omnibus/Gemfile b/omnibus/Gemfile index fe80adc411..388dfbe4bc 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.6.0" + gem "test-kitchen", "~> 1.5.0" gem "kitchen-vagrant", "~> 0.19.0" - gem "winrm-fs", "~> 0.3.2" + gem "winrm-transport", "~> 1.0" gem "pry" gem "pry-byebug" gem "pry-stack_explorer" |