summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-12-21 10:39:59 -0800
committerTim Smith <tsmith@chef.io>2017-12-21 10:54:47 -0800
commitc20caa0232c30c645b90439daaa9dfeaea6394b3 (patch)
treeff41d028471133ab77bff114116bc6df21ba866f
parent37bacbbc9d6ca124af631acf72109a992b255e6a (diff)
downloadchef-c20caa0232c30c645b90439daaa9dfeaea6394b3.tar.gz
Remove unnecessary dependencies for kitchen integration testings
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--kitchen-tests/Berksfile.lock4
-rw-r--r--kitchen-tests/Gemfile4
-rw-r--r--kitchen-tests/Gemfile.lock70
3 files changed, 28 insertions, 50 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 815567bc1a..5202f04480 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -31,7 +31,7 @@ GRAPH
cron (>= 4.2.0)
logrotate (>= 1.9.0)
windows (>= 2.0.0)
- chef-yum-docker (3.1.0)
+ chef-yum-docker (3.1.1)
chef_hostname (0.6.1)
compat_resource (12.19.0)
cron (5.0.1)
@@ -57,6 +57,6 @@ GRAPH
sudo (4.0.0)
ubuntu (2.0.1)
apt (>= 0.0.0)
- users (5.3.0)
+ users (5.3.1)
windows (3.4.1)
ohai (>= 4.0.0)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index e41d2ff808..a54f11143f 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -1,13 +1,9 @@
source "https://rubygems.org"
-gem "chef-config", "< 13"
gem "rake" # required to build some native extensions
gem "berkshelf"
gem "kitchen-appbundle-updater"
gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
-gem "kitchen-ec2"
gem "kitchen-inspec"
gem "kitchen-vagrant"
-gem "ridley"
gem "test-kitchen"
-gem "vagrant-wrapper"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 3dfae20dd8..d656862bb6 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,14 +3,6 @@ GEM
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
- aws-sdk (2.10.94)
- aws-sdk-resources (= 2.10.94)
- aws-sdk-core (2.10.94)
- aws-sigv4 (~> 1.0)
- jmespath (~> 1.0)
- aws-sdk-resources (2.10.94)
- aws-sdk-core (= 2.10.94)
- aws-sigv4 (1.0.2)
berkshelf (6.3.1)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
@@ -41,16 +33,17 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef (12.21.26)
+ chef (13.6.4)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.26)
- chef-zero (>= 4.8, < 13)
+ chef-config (= 13.6.4)
+ chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
+ iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
@@ -59,7 +52,7 @@ GEM
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (>= 8.6.0.alpha.1, < 13)
+ ohai (~> 13.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -70,17 +63,18 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.21.26-universal-mingw32)
+ chef (13.6.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.26)
- chef-zero (>= 4.8, < 13)
+ chef-config (= 13.6.4)
+ chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
+ iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
@@ -89,7 +83,7 @@ GEM
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (>= 8.6.0.alpha.1, < 13)
+ ohai (~> 13.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@@ -110,12 +104,12 @@ GEM
win32-service (~> 0.8.7)
windows-api (~> 0.4.4)
wmi-lite (~> 1.0)
- chef-config (12.21.26)
+ chef-config (13.6.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
- chef-zero (5.3.2)
+ chef-zero (13.1.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
@@ -129,10 +123,11 @@ GEM
excon (>= 0.47.0)
multi_json
erubis (2.7.0)
- excon (0.59.0)
+ excon (0.60.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
+ ffi (1.9.18-x64-mingw32)
ffi (1.9.18-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
@@ -143,14 +138,14 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hashie (3.5.6)
+ hashie (3.5.7)
highline (1.7.10)
hitimes (1.2.6)
hitimes (1.2.6-x86-mingw32)
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.4.4)
- inspec (1.46.2)
+ inspec (1.48.0)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -161,7 +156,6 @@ GEM
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
- rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
@@ -169,20 +163,14 @@ GEM
sslshake (~> 1.2)
thor (~> 0.19)
tomlrb (~> 1.2)
- train (~> 0.29, >= 0.29.2)
+ train (~> 0.31, >= 0.31.1)
ipaddress (0.8.3)
- jmespath (1.3.1)
+ iso8601 (0.9.1)
json (2.1.0)
kitchen-appbundle-updater (0.2.0)
kitchen-dokken (1.1.0)
docker-api (~> 1.33)
test-kitchen (~> 1.13)
- kitchen-ec2 (1.4.0)
- aws-sdk (~> 2)
- excon
- multi_json
- retryable (~> 2.0)
- test-kitchen (~> 1.4, >= 1.4.1)
kitchen-inspec (0.20.0)
hashie (~> 3.4)
inspec (>= 0.34.0, < 2.0.0)
@@ -201,7 +189,7 @@ GEM
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (3.8.0)
+ mixlib-install (3.9.0)
mixlib-shellout
mixlib-versioning
thor
@@ -227,9 +215,9 @@ GEM
net-telnet (0.1.1)
nio4r (2.1.0)
nori (2.6.0)
- octokit (4.7.0)
+ octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.25.1)
+ ohai (13.7.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -241,17 +229,15 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
- parallel (1.12.0)
+ parallel (1.12.1)
parslet (1.8.1)
- plist (3.3.0)
+ plist (3.4.0)
proxifier (1.0.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (2.0.3)
- rainbow (2.2.2)
- rake
rake (12.3.0)
retryable (2.0.4)
ridley (5.1.1)
@@ -307,7 +293,7 @@ GEM
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
- specinfra (2.72.1)
+ specinfra (2.73.0)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
@@ -330,7 +316,7 @@ GEM
timers (4.0.4)
hitimes
tomlrb (1.2.6)
- train (0.29.2)
+ train (0.31.1)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
@@ -339,7 +325,6 @@ GEM
winrm (~> 2.0)
winrm-fs (~> 1.0)
uuidtools (2.1.5)
- vagrant-wrapper (2.0.3)
varia_model (0.6.0)
buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
@@ -384,20 +369,17 @@ GEM
PLATFORMS
ruby
+ x64-mingw32
x86-mingw32
DEPENDENCIES
berkshelf
- chef-config (< 13)
kitchen-appbundle-updater
kitchen-dokken (< 2.0)
- kitchen-ec2
kitchen-inspec
kitchen-vagrant
rake
- ridley
test-kitchen
- vagrant-wrapper
BUNDLED WITH
1.16.0