From 2b00f4d915ef79faadb984e3f12a209fc6bf8551 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Fri, 15 Sep 2017 16:21:46 -0700
Subject: Test new cookbooks. The world has changed in 3 years

database::mysql was used to install the gem. It auto installs now.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 kitchen-tests/Berksfile                           |  2 +-
 kitchen-tests/Berksfile.lock                      | 70 ++++++++++++-----------
 kitchen-tests/cookbooks/webapp/metadata.rb        |  7 +--
 kitchen-tests/cookbooks/webapp/recipes/default.rb |  3 +-
 4 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'kitchen-tests')

diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 350553404d..3996a4aa37 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,6 +1,6 @@
 source "https://supermarket.chef.io"
 
-#cookbook "webapp", path: "cookbooks/webapp"
+cookbook "webapp", path: "cookbooks/webapp"
 cookbook "base", path: "cookbooks/base"
 
 # Disabled pending updating these test cases for Chef 13.
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 3d6e8d15c0..0842e6d3ec 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -1,13 +1,12 @@
 DEPENDENCIES
   base
     path: cookbooks/base
-  php (~> 1.5.0)
-  resolver
-    git: https://github.com/chef-cookbooks/resolver.git
-    revision: 4ab8cb0dfee3696fb8a1e4398e95bff9f33fd6ab
+  webapp
+    path: cookbooks/webapp
 
 GRAPH
-  apt (6.0.1)
+  apache2 (4.0.0)
+  apt (6.1.4)
   base (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
@@ -23,50 +22,53 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (8.0.0)
+  build-essential (8.0.3)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-client (8.0.0)
-    cron (>= 1.7.0)
+  chef-client (8.1.8)
+    cron (>= 2.0.0)
     logrotate (>= 1.9.0)
-    windows (>= 1.42.0)
-  chef_hostname (0.5.0)
-  compat_resource (12.16.3)
-  cron (4.1.0)
+    windows (>= 2.0.0)
+  chef_hostname (0.6.1)
+  compat_resource (12.19.0)
+  cron (4.1.3)
     compat_resource (>= 0.0.0)
-  iis (5.1.0)
-    windows (>= 2.0)
-  iptables (4.0.1)
-  logrotate (2.1.0)
-    compat_resource (>= 0.0.0)
-  mingw (2.0.0)
+  database (6.1.1)
+    postgresql (>= 1.0.0)
+  iptables (4.2.1)
+  logrotate (2.2.0)
+  mingw (2.0.1)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
-  mysql (8.3.1)
+  mysql (8.5.1)
   nscd (5.0.0)
-  ntp (3.3.1)
-  ohai (5.0.2)
-  openssh (2.2.0)
+  ntp (3.5.2)
+  ohai (5.2.0)
+  openssh (2.4.1)
     iptables (>= 1.0)
-  php (1.5.0)
+  openssl (7.1.0)
+  php (4.5.0)
     build-essential (>= 0.0.0)
-    iis (>= 0.0.0)
-    mysql (>= 0.0.0)
-    windows (>= 0.0.0)
-    xml (>= 0.0.0)
+    mysql (>= 6.0.0)
     yum-epel (>= 0.0.0)
+  postgresql (6.1.1)
+    build-essential (>= 2.0.0)
+    compat_resource (>= 12.16.3)
+    openssl (>= 4.0)
   resolver (2.0.1)
-  selinux (1.0.3)
+  selinux (2.0.3)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
-  sudo (3.3.1)
+  sudo (3.5.3)
   ubuntu (2.0.1)
     apt (>= 0.0.0)
-  users (4.0.3)
-  windows (3.0.4)
+  users (5.1.0)
+  webapp (0.1.0)
+    apache2 (~> 4.0.0)
+    database (~> 6.1.1)
+    php (~> 4.5.0)
+  windows (3.1.2)
     ohai (>= 4.0.0)
-  xml (3.1.1)
-    build-essential (>= 0.0.0)
-  yum-epel (2.1.1)
+  yum-epel (2.1.2)
     compat_resource (>= 12.16.3)
diff --git a/kitchen-tests/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb
index f560159fd8..f0ce5ac040 100644
--- a/kitchen-tests/cookbooks/webapp/metadata.rb
+++ b/kitchen-tests/cookbooks/webapp/metadata.rb
@@ -6,7 +6,6 @@ description      "Installs/Configures webapp"
 long_description "Installs/Configures webapp"
 version          "0.1.0"
 
-depends "apache2", "~> 3.2.2"
-depends "database", "~> 2.3.1"
-depends "mysql", "~> 5.6.3"
-depends "php", "~> 1.5.0"
+depends "apache2", "~> 4.0.0"
+depends "database", "~> 6.1.1"
+depends "php", "~> 4.5.0"
diff --git a/kitchen-tests/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb
index 2b3459b794..7f3b1804ab 100644
--- a/kitchen-tests/cookbooks/webapp/recipes/default.rb
+++ b/kitchen-tests/cookbooks/webapp/recipes/default.rb
@@ -2,11 +2,10 @@
 # Cookbook Name:: webapp
 # Recipe:: default
 #
-# Copyright (C) 2014
+# Copyright:: Chef Software, Inc. 2016-2017
 #
 
 include_recipe "apache2"
-include_recipe "database::mysql"
 include_recipe "php"
 
 creds = Hash.new
-- 
cgit v1.2.1