Swap awesome_customers for the new learnchef 'lamp' cookbook

Signed-off-by: Tim Smith <tsmith@chef.io>

8 files changed, 45 insertions, 50 deletions

diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 720f034cb5..d0a2cc3d0b 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -114,9 +114,7 @@ suites:
   - name: base
     run_list:
       - recipe[base::default]
-  - name: awesome_customers_ubuntu
+  - name: learnchef_lamp
     run_list:
-      - recipe[awesome_customers_ubuntu_wrapper::default]
-  - name: awesome_customers_rhel
-    run_list:
-      - recipe[awesome_customers_rhel_wrapper::default]
+      - recipe[lamp::default]
+    data_bags_path: data_bags
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 4e570b125e..af680acbf8 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -31,9 +31,7 @@ suites:
   - name: base
     run_list:
       - recipe[base::default]
-  - name: awesome_customers_ubuntu
+  - name: learnchef_lamp
     run_list:
-      - recipe[awesome_customers_ubuntu_wrapper::default]
-  - name: awesome_customers_rhel
-    run_list:
-      - recipe[awesome_customers_rhel_wrapper::default]
+      - recipe[lamp::default]
+    data_bags_path: data_bags
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 22f838d83e..38c109bb03 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,9 +1,4 @@
 source "https://supermarket.chef.io"
 
 cookbook "base", path: "cookbooks/base"
-
-# Disabled pending updating these test cases for Chef 13.
-# cookbook "awesome_customers_ubuntu_wrapper", path: "cookbooks/awesome_customers_ubuntu_wrapper"
-# cookbook "awesome_customers_ubuntu", github: "lamont-granquist/awesome_customers_ubuntu", branch: "lcg/bump-mysql-version"
-# cookbook "awesome_customers_rhel_wrapper", path: "cookbooks/awesome_customers_rhel_wrapper"
-# cookbook "awesome_customers_rhel", github: "lamont-granquist/awesome_customers_rhel", branch: "lcg/bump-mysql-version"
+cookbook "lamp", github: "tas50/lamp" # waiting on PR merge for chef 13 compat
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 6cd1308fcd..06aea8349b 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -1,6 +1,9 @@
 DEPENDENCIES
   base
     path: cookbooks/base
+  lamp
+    git: https://github.com/tas50/lamp.git
+    revision: 8d74e6b769f2d74bfee754fb7d686cbfdeb554c6
 
 GRAPH
   apt (6.1.4)
@@ -30,19 +33,48 @@ GRAPH
   compat_resource (12.19.0)
   cron (4.1.3)
     compat_resource (>= 0.0.0)
+  database (6.1.1)
+    postgresql (>= 1.0.0)
+  httpd (0.5.0)
+  inifile_chef_gem (0.1.0)
+    build-essential (>= 0.0.0)
   iptables (4.2.1)
+  lamp (0.1.0)
+    database (~> 6.1)
+    httpd (~> 0.4)
+    mysql (~> 8.0)
+    mysql2_chef_gem (~> 2.0)
   logrotate (2.2.0)
+  mariadb (1.5.1)
+    apt (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    selinux_policy (~> 2.0)
+    yum (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+    yum-scl (>= 0.0.0)
   mingw (2.0.1)
     seven_zip (>= 0.0.0)
   multipackage (4.0.0)
     compat_resource (>= 0.0.0)
+  mysql (8.5.1)
+  mysql2_chef_gem (2.1.0)
+    build-essential (>= 2.4.0)
+    mariadb (>= 0.0.0)
+    mysql (>= 8.2.0)
   nscd (5.0.0)
   ntp (3.5.2)
   ohai (5.2.0)
   openssh (2.5.0)
     iptables (>= 1.0)
+  openssl (7.1.0)
+  postgresql (6.1.1)
+    build-essential (>= 2.0.0)
+    compat_resource (>= 12.16.3)
+    openssl (>= 4.0)
   resolver (2.0.1)
   selinux (2.1.0)
+  selinux_policy (2.0.1)
+    compat_resource (>= 12.16.3)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
   sudo (3.5.3)
@@ -51,3 +83,9 @@ GRAPH
   users (5.1.0)
   windows (3.1.2)
     ohai (>= 4.0.0)
+  yum (5.0.1)
+  yum-epel (2.1.2)
+    compat_resource (>= 12.16.3)
+  yum-scl (0.2.0)
+    inifile_chef_gem (>= 0.0.0)
+    yum (>= 0.0.0)
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
deleted file mode 100644
index 49dbb50869..0000000000
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-name "awesome_customers_rhel_wrapper"
-maintainer "The Authors"
-maintainer_email "you@example.com"
-license "Apache-2.0"
-description "Installs/Configures awesome_customers_rhel"
-long_description "Installs/Configures awesome_customers_rhel"
-version "0.1.0"
-
-depends "awesome_customers_rhel"
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
deleted file mode 100644
index c58db5fe29..0000000000
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Cookbook:: awesome_customers_rhel
-# Recipe:: default
-#
-# Copyright:: 2014-2017, Chef Software, Inc.
-#
-
-include_recipe "awesome_customers_rhel::default"
diff --git a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
deleted file mode 100644
index d07a2c2c13..0000000000
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-name "awesome_customers_ubuntu_wrapper"
-maintainer "The Authors"
-maintainer_email "you@example.com"
-license "Apache-2.0"
-description "Installs/Configures awesome_customers_ubuntu"
-long_description "Installs/Configures awesome_customers_ubuntu"
-version "0.1.0"
-
-depends "awesome_customers_ubuntu"
diff --git a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
deleted file mode 100644
index f6fd388f16..0000000000
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Cookbook:: awesome_customers_ubuntu
-# Recipe:: default
-#
-# Copyright:: 2016-2017, Chef Software, Inc.
-#
-
-include_recipe "awesome_customers_ubuntu::default"