diff options
author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-05 09:59:31 -0600 |
---|---|---|
committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-05 09:59:31 -0600 |
commit | 97669adafff1e8a4294b352a33cda0cb00859d99 (patch) | |
tree | 377d160b5feaae1b6ea69a2496b42fe2ef059955 | |
parent | f28ec615c7499fb3b76bdcd5f50a2e97e8289cc8 (diff) | |
parent | 002b0bc04785b657fa3620be2ace0ffee61e0e02 (diff) | |
download | chef-97669adafff1e8a4294b352a33cda0cb00859d99.tar.gz |
Merge pull request #4786 from chef/tk_17
use latest released test-kitchen in chef-acceptance
-rw-r--r-- | acceptance/Gemfile | 4 | ||||
-rw-r--r-- | omnibus/Gemfile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile index 87614ae202..72dded468c 100644 --- a/acceptance/Gemfile +++ b/acceptance/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "chef-acceptance", github: "chef/chef-acceptance" -gem "test-kitchen", github: "test-kitchen/test-kitchen" +gem "test-kitchen" gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2", branch: "jk/image-search-only" gem "kitchen-inspec" gem "inspec" @@ -9,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-fs", "~> 0.4.0" +gem "winrm-fs" gem "berkshelf" diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 0b076825fc..ef1dec354d 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.6.0" + gem "test-kitchen", "~> 1.7.1" gem "kitchen-vagrant", "~> 0.19.0" - gem "winrm-fs", "~> 0.3.2" + gem "winrm-fs", "~> 0.4.0" gem "pry" gem "pry-byebug" gem "pry-stack_explorer" |