summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-06-16 13:49:20 -0600
committertyler-ball <tyleraball@gmail.com>2016-06-16 13:49:20 -0600
commit1b73e8c00770b17c1797bb392c665911467c4cfd (patch)
tree40c4203221ba884d950bfd01c1a6ef00dfe56b41 /kitchen-tests
parent0adfa8bcd36c0208b5819bbb15f46aa19ad407ba (diff)
downloadchef-1b73e8c00770b17c1797bb392c665911467c4cfd.tar.gz
Reverting kitchen-tests updates to try and get them passing in Travismsys2
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Berksfile.lock26
-rw-r--r--kitchen-tests/Gemfile.lock46
2 files changed, 35 insertions, 37 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 3b5e91ddb7..d24f5d7bfe 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -10,8 +10,7 @@ DEPENDENCIES
GRAPH
apache2 (3.2.2)
- apt (4.0.0)
- compat_resource (>= 0.0.0)
+ apt (3.0.0)
aws (3.3.3)
ohai (>= 2.1.0)
base (0.1.0)
@@ -30,19 +29,18 @@ GRAPH
ubuntu (>= 0.0.0)
users (>= 0.0.0)
yum-epel (>= 0.0.0)
- build-essential (6.0.0)
- compat_resource (>= 12.10)
- mingw (>= 1.1)
+ build-essential (4.0.0)
+ mingw (>= 0.0.0)
seven_zip (>= 0.0.0)
- chef-client (4.6.0)
+ chef-client (4.5.2)
cron (>= 1.7.0)
logrotate (>= 1.9.0)
- windows (>= 1.42.0)
+ windows (>= 1.39.0)
chef-sugar (3.3.0)
chef_handler (1.4.0)
chef_hostname (0.4.1)
compat_resource (>= 0.0.0)
- compat_resource (12.10.6)
+ compat_resource (12.10.4)
cron (1.7.6)
database (2.3.1)
aws (>= 0.0.0)
@@ -50,11 +48,11 @@ GRAPH
mysql-chef_gem (~> 0.0)
postgresql (>= 1.0.0)
xfs (>= 0.0.0)
- iis (4.1.8)
+ iis (4.1.7)
windows (>= 1.34.6)
iptables (2.2.0)
logrotate (1.9.2)
- mingw (1.2.0)
+ mingw (1.0.0)
compat_resource (>= 0.0.0)
seven_zip (>= 0.0.0)
multipackage (3.0.28)
@@ -64,11 +62,11 @@ GRAPH
mysql-chef_gem (0.0.5)
build-essential (>= 0.0.0)
mysql (>= 0.0.0)
- nscd (4.1.0)
+ nscd (4.0.0)
compat_resource (>= 0.0.0)
ntp (2.0.0)
windows (>= 1.38.0)
- ohai (4.1.0)
+ ohai (4.0.2)
compat_resource (>= 12.9.0)
openssh (2.0.0)
iptables (>= 1.0)
@@ -98,13 +96,13 @@ GRAPH
database (~> 2.3.1)
mysql (~> 5.6.3)
php (~> 1.5.0)
- windows (1.43.0)
+ windows (1.41.0)
chef_handler (>= 0.0.0)
xfs (2.0.1)
xml (2.0.0)
build-essential (>= 0.0.0)
chef-sugar (>= 0.0.0)
- yum (3.11.0)
+ yum (3.10.0)
yum-epel (0.7.0)
yum (>= 3.6.3)
yum-mysql-community (0.2.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 1a64f943f3..8ab7fbe707 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,13 +3,13 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.3.14)
- aws-sdk-resources (= 2.3.14)
- aws-sdk-core (2.3.14)
+ aws-sdk (2.3.9)
+ aws-sdk-resources (= 2.3.9)
+ aws-sdk-core (2.3.9)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.14)
- aws-sdk-core (= 2.3.14)
- berkshelf (4.3.5)
+ aws-sdk-resources (2.3.9)
+ aws-sdk-core (= 2.3.9)
+ berkshelf (4.3.3)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
buff-config (~> 1.0)
@@ -21,7 +21,6 @@ GEM
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
- mixlib-archive (~> 0.1)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 4.5)
@@ -45,7 +44,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.11.18)
+ chef-config (12.10.24)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -60,7 +59,6 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
- ffi (1.9.10-x86-mingw32)
fuzzyurl (0.8.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -70,17 +68,17 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.7.2)
- inspec (0.26.0)
+ inspec (0.22.1)
hashie (~> 3.4)
json (~> 1.8)
method_source (~> 0.8)
pry (~> 0)
+ r-train (~> 0.12)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
thor (~> 0.19)
- train (~> 0.13)
jmespath (1.2.4)
json_pure (>= 1.8.1)
json (1.8.3)
@@ -106,11 +104,13 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-archive (0.1.0)
- mixlib-authentication (1.4.1)
+ mixlib-authentication (1.4.0)
mixlib-log
+ rspec-core (~> 3.2)
+ rspec-expectations (~> 3.2)
+ rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.13)
+ mixlib-install (1.0.12)
artifactory
mixlib-shellout
mixlib-versioning
@@ -134,6 +134,14 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
+ r-train (0.12.1)
+ docker-api (~> 1.26)
+ json (~> 1.8)
+ mixlib-shellout (~> 2.0)
+ net-scp (~> 1.2)
+ net-ssh (>= 2.9, < 4.0)
+ winrm (~> 1.6)
+ winrm-fs (~> 0.3)
rainbow (2.1.0)
retryable (2.0.3)
ridley (4.5.1)
@@ -181,7 +189,7 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- test-kitchen (1.9.2)
+ test-kitchen (1.9.0)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
@@ -191,14 +199,6 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
- train (0.13.1)
- docker-api (~> 1.26)
- json (~> 1.8)
- mixlib-shellout (~> 2.0)
- net-scp (~> 1.2)
- net-ssh (>= 2.9, < 4.0)
- winrm (~> 1.6)
- winrm-fs (~> 0.3)
vagrant-wrapper (2.0.3)
varia_model (0.4.1)
buff-extensions (~> 1.0)