summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaymala Sinha <jsinha@chef.io>2019-03-28 14:35:47 -0400
committerJaymala Sinha <jsinha@chef.io>2019-03-28 14:35:47 -0400
commit8a38a450c87b0e6eeb17bc7d817f69ad1f1414b0 (patch)
tree0361b08c37d183d3b9ca3a3a1334ef85f8ed2a8b
parent77471229083ebfb3c05d2a341c488ad1ee54a0a3 (diff)
downloadchef-jsinha/remove_windows-api_dep.tar.gz
Remove test-kitchen pinsjsinha/remove_windows-api_dep
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
-rw-r--r--kitchen-tests/Gemfile2
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock28
3 files changed, 17 insertions, 17 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index c571298fc2..330818e57c 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -5,7 +5,7 @@ gem "chef", path: ".."
gem "ohai", git: "https://github.com/chef/ohai.git", branch: "14-stable" # avoids failures when we bump chef major
gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
gem "kitchen-appbundle-updater"
-gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
+gem "kitchen-dokken"
gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master"
gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master"
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index a1cd1bbe48..3580039d4f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -17,8 +17,8 @@ group :development do
gem "ohai", "~> 14.0"
# Use Test Kitchen with Vagrant for converging the build environment
- gem "test-kitchen", "~> 1.21"
- gem "kitchen-vagrant", "~> 1.3.1"
+ gem "test-kitchen"
+ gem "kitchen-vagrant"
gem "winrm-fs", "~> 1.0"
gem "pry"
gem "pry-byebug"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 528b44220f..d9dc3f3534 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: c824e911af6dab44e9866a5e05d2e0217518a76f
+ revision: 096b70201d073a4aaca8f3b9faf76d4c648d05d5
branch: master
specs:
- omnibus (6.0.21)
+ omnibus (6.0.22)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -179,8 +179,8 @@ GEM
ipaddress (0.8.3)
iso8601 (0.12.1)
jmespath (1.4.0)
- kitchen-vagrant (1.3.6)
- test-kitchen (~> 1.4)
+ kitchen-vagrant (1.5.1)
+ test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license_scout (1.0.22)
ffi-yajl (~> 2.2)
@@ -213,13 +213,13 @@ GEM
molinillo (0.6.6)
multi_json (1.13.1)
multipart-post (2.0.0)
- net-scp (1.2.1)
- net-ssh (>= 2.6.5)
+ net-scp (2.0.0)
+ net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
- net-ssh-gateway (1.3.0)
- net-ssh (>= 2.6.5)
+ net-ssh-gateway (2.0.0)
+ net-ssh (>= 4.0.0)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
@@ -303,12 +303,12 @@ GEM
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (1.24.0)
+ test-kitchen (2.0.1)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
- net-scp (~> 1.1)
- net-ssh (>= 2.9, < 5.0)
- net-ssh-gateway (~> 1.2)
+ net-scp (>= 1.1, < 3.0)
+ net-ssh (>= 2.9, < 6.0)
+ net-ssh-gateway (>= 1.2, < 3.0)
thor (~> 0.19)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
@@ -371,7 +371,7 @@ PLATFORMS
DEPENDENCIES
berkshelf (>= 7.0)
- kitchen-vagrant (~> 1.3.1)
+ kitchen-vagrant
ohai (~> 14.0)
omnibus!
omnibus-software!
@@ -379,7 +379,7 @@ DEPENDENCIES
pry
pry-byebug
pry-stack_explorer
- test-kitchen (~> 1.21)
+ test-kitchen
winrm-fs (~> 1.0)
BUNDLED WITH