summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-06-14 11:31:08 -0600
committertyler-ball <tyleraball@gmail.com>2016-06-15 10:10:53 -0600
commit5581377922587f6e83221e4a8b4795cbf4a8cd87 (patch)
tree35ed56146b7830ecd288b8bcebe5fc5e1b6aa06e /kitchen-tests
parentebc4657b45c706d7ec68d99accce203cf49aff0f (diff)
downloadchef-5581377922587f6e83221e4a8b4795cbf4a8cd87.tar.gz
Making rake:dependencies work
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Berksfile2
-rw-r--r--kitchen-tests/Berksfile.lock29
-rw-r--r--kitchen-tests/Gemfile.lock29
3 files changed, 30 insertions, 30 deletions
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 31e49b3e18..407b685236 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -5,4 +5,4 @@ cookbook "base", path: "cookbooks/base"
cookbook "php", "~> 1.5.0"
-cookbook "resolver", github: "chef-cookbooks/resolver", branch: "lcg/docker"
+cookbook "resolver", github: "chef-cookbooks/resolver"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index f4a9de89e2..3b5e91ddb7 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -4,14 +4,14 @@ DEPENDENCIES
php (~> 1.5.0)
resolver
git: git://github.com/chef-cookbooks/resolver.git
- revision: dd65ab8e2346cc0739c13682c74868f5b939b06a
- branch: lcg/docker
+ revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
webapp
path: cookbooks/webapp
GRAPH
apache2 (3.2.2)
- apt (3.0.0)
+ apt (4.0.0)
+ compat_resource (>= 0.0.0)
aws (3.3.3)
ohai (>= 2.1.0)
base (0.1.0)
@@ -30,18 +30,19 @@ GRAPH
ubuntu (>= 0.0.0)
users (>= 0.0.0)
yum-epel (>= 0.0.0)
- build-essential (4.0.0)
- mingw (>= 0.0.0)
+ build-essential (6.0.0)
+ compat_resource (>= 12.10)
+ mingw (>= 1.1)
seven_zip (>= 0.0.0)
- chef-client (4.5.2)
+ chef-client (4.6.0)
cron (>= 1.7.0)
logrotate (>= 1.9.0)
- windows (>= 1.39.0)
+ windows (>= 1.42.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.4)
+ compat_resource (12.10.6)
cron (1.7.6)
database (2.3.1)
aws (>= 0.0.0)
@@ -49,11 +50,11 @@ GRAPH
mysql-chef_gem (~> 0.0)
postgresql (>= 1.0.0)
xfs (>= 0.0.0)
- iis (4.1.7)
+ iis (4.1.8)
windows (>= 1.34.6)
iptables (2.2.0)
logrotate (1.9.2)
- mingw (1.0.0)
+ mingw (1.2.0)
compat_resource (>= 0.0.0)
seven_zip (>= 0.0.0)
multipackage (3.0.28)
@@ -63,11 +64,11 @@ GRAPH
mysql-chef_gem (0.0.5)
build-essential (>= 0.0.0)
mysql (>= 0.0.0)
- nscd (4.0.0)
+ nscd (4.1.0)
compat_resource (>= 0.0.0)
ntp (2.0.0)
windows (>= 1.38.0)
- ohai (4.0.2)
+ ohai (4.1.0)
compat_resource (>= 12.9.0)
openssh (2.0.0)
iptables (>= 1.0)
@@ -97,13 +98,13 @@ GRAPH
database (~> 2.3.1)
mysql (~> 5.6.3)
php (~> 1.5.0)
- windows (1.41.0)
+ windows (1.43.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.10.0)
+ yum (3.11.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 8ab7fbe707..36d2dfc037 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.9)
- aws-sdk-resources (= 2.3.9)
- aws-sdk-core (2.3.9)
+ aws-sdk (2.3.13)
+ aws-sdk-resources (= 2.3.13)
+ aws-sdk-core (2.3.13)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.9)
- aws-sdk-core (= 2.3.9)
- berkshelf (4.3.3)
+ aws-sdk-resources (2.3.13)
+ aws-sdk-core (= 2.3.13)
+ berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
buff-config (~> 1.0)
@@ -21,6 +21,7 @@ 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)
@@ -44,7 +45,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (12.10.24)
+ chef-config (12.11.18)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -58,7 +59,7 @@ GEM
excon (0.49.0)
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)
@@ -68,7 +69,7 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.7.2)
- inspec (0.22.1)
+ inspec (0.25.0)
hashie (~> 3.4)
json (~> 1.8)
method_source (~> 0.8)
@@ -104,13 +105,11 @@ GEM
multi_json (~> 1.10)
method_source (0.8.2)
minitar (0.5.4)
- mixlib-authentication (1.4.0)
+ mixlib-archive (0.1.0)
+ mixlib-authentication (1.4.1)
mixlib-log
- rspec-core (~> 3.2)
- rspec-expectations (~> 3.2)
- rspec-mocks (~> 3.2)
mixlib-config (2.2.1)
- mixlib-install (1.0.12)
+ mixlib-install (1.0.13)
artifactory
mixlib-shellout
mixlib-versioning
@@ -189,7 +188,7 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- test-kitchen (1.9.0)
+ test-kitchen (1.9.2)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)