Merge pull request #5418 from chef/lcg/learnchef

add learnchef testing to travis matrix

9 files changed, 140 insertions, 37 deletions

diff --git a/.travis.yml b/.travis.yml
index 3fb6461607..0c2ae0b153 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,7 +119,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test ubuntu-1204
+      - bundle exec kitchen test webapp-ubuntu-1204
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -137,7 +137,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test ubuntu-1404
+      - bundle exec kitchen test webapp-ubuntu-1404
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -155,7 +155,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test ubuntu-1604
+      - bundle exec kitchen test webapp-ubuntu-1604
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -173,7 +173,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test debian-7
+      - bundle exec kitchen test webapp-debian-7
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -191,7 +191,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test debian-8
+      - bundle exec kitchen test webapp-debian-8
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
     after_failure:
       - cat .kitchen/logs/kitchen.log
@@ -210,7 +210,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test centos-6
+      - bundle exec kitchen test webapp-centos-6
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -228,7 +228,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test centos-7
+      - bundle exec kitchen test webapp-centos-7
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -246,12 +246,48 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test fedora-23
+      - bundle exec kitchen test webapp-fedora-23
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
       - FEDORA=23
       - KITCHEN_YAML=.kitchen.travis.yml
+  - rvm: 2.3.1
+    services: docker
+    sudo: required
+    gemfile: kitchen-tests/Gemfile
+    before_install:
+      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
+    bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+    before_script:
+      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+      - cd kitchen-tests
+    script:
+      - bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404
+    after_failure:
+      - cat .kitchen/logs/kitchen.log
+    env:
+      - AWESOME_CUSTOMERS_UBUNTU=1
+      - KITCHEN_YAML=.kitchen.travis.yml
+  - rvm: 2.3.1
+    services: docker
+    sudo: required
+    gemfile: kitchen-tests/Gemfile
+    before_install:
+      - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+      - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
+    bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+    before_script:
+      - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+      - cd kitchen-tests
+    script:
+      - bundle exec kitchen test awesome-customers-rhel-centos-7
+    after_failure:
+      - cat .kitchen/logs/kitchen.log
+    env:
+      - AWESOME_CUSTOMERS_RHEL=1
+      - KITCHEN_YAML=.kitchen.travis.yml
     ### END TEST KITCHEN ONLY ###
   - rvm: 2.3.1
     sudo: required
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index d73b41368d..312764e9e4 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -118,4 +118,9 @@ suites:
   - name: webapp
     run_list:
       - recipe[base::default]
-#      - recipe[webapp::default]
+  - name: awesome_customers_ubuntu
+    run_list:
+      - recipe[awesome_customers_ubuntu_wrapper::default]
+  - name: awesome_customers_rhel
+    run_list:
+      - recipe[awesome_customers_rhel_wrapper::default]
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 314857663e..d6df77932a 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -33,5 +33,9 @@ suites:
   - name: webapp
     run_list:
       - recipe[base::default]
-#      - recipe[webapp::default]
-    attributes:
+  - name: awesome_customers_ubuntu
+    run_list:
+      - recipe[awesome_customers_ubuntu_wrapper::default]
+  - name: awesome_customers_rhel
+    run_list:
+      - recipe[awesome_customers_rhel_wrapper::default]
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 407b685236..45695ca5a3 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,8 +1,13 @@
 source "https://supermarket.getchef.com"
 
-cookbook "webapp", path: "cookbooks/webapp"
+#cookbook "webapp", path: "cookbooks/webapp"
 cookbook "base", path: "cookbooks/base"
 
 cookbook "php", "~> 1.5.0"
 
 cookbook "resolver", github: "chef-cookbooks/resolver"
+
+cookbook "awesome_customers_ubuntu_wrapper", path: "cookbooks/awesome_customers_ubuntu_wrapper"
+cookbook "awesome_customers_ubuntu", github: "learn-chef/awesome_customers_ubuntu"
+cookbook "awesome_customers_rhel_wrapper", path: "cookbooks/awesome_customers_rhel_wrapper"
+cookbook "awesome_customers_rhel", github: "learn-chef/awesome_customers_rhel"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 518aa56fac..f08e94dc94 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -1,19 +1,42 @@
 DEPENDENCIES
+  awesome_customers_rhel
+    git: https://github.com/learn-chef/awesome_customers_rhel.git
+    revision: 1ac86593829610c0eab7a45d9c63c09a9cea1754
+  awesome_customers_rhel_wrapper
+    path: cookbooks/awesome_customers_rhel_wrapper
+  awesome_customers_ubuntu
+    git: https://github.com/learn-chef/awesome_customers_ubuntu.git
+    revision: 71927c094d570e6fd0f8bfbcc02ebe3556af2a16
+  awesome_customers_ubuntu_wrapper
+    path: cookbooks/awesome_customers_ubuntu_wrapper
   base
     path: cookbooks/base
   php (~> 1.5.0)
   resolver
     git: https://github.com/chef-cookbooks/resolver.git
     revision: 8bf9034dabc47d29a07870e4059c32114f2c820a
-  webapp
-    path: cookbooks/webapp
 
 GRAPH
-  apache2 (3.2.2)
   apt (4.0.2)
     compat_resource (>= 12.10)
-  aws (4.1.1)
-    ohai (>= 4.0)
+  awesome_customers_rhel (0.1.0)
+    database (~> 6.0)
+    firewall (~> 2.5)
+    httpd (~> 0.4)
+    mysql (~> 7.0)
+    mysql2_chef_gem (~> 1.1)
+    selinux (~> 0.9)
+  awesome_customers_rhel_wrapper (0.1.0)
+    awesome_customers_rhel (>= 0.0.0)
+  awesome_customers_ubuntu (0.1.0)
+    apt (~> 4.0)
+    database (~> 6.0)
+    firewall (~> 2.5)
+    httpd (~> 0.4)
+    mysql (~> 7.0)
+    mysql2_chef_gem (~> 1.1)
+  awesome_customers_ubuntu_wrapper (0.1.0)
+    awesome_customers_ubuntu (>= 0.0.0)
   base (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
@@ -42,37 +65,40 @@ GRAPH
     compat_resource (>= 0.0.0)
   compat_resource (12.14.7)
   cron (2.0.0)
-  database (2.3.1)
-    aws (>= 0.0.0)
-    mysql (~> 5.0)
-    mysql-chef_gem (~> 0.0)
+  database (6.0.0)
     postgresql (>= 1.0.0)
-    xfs (>= 0.0.0)
+  firewall (2.5.2)
+    chef-sugar (>= 0.0.0)
+  httpd (0.4.4)
+    compat_resource (>= 12.14.6)
   iis (5.0.1)
     windows (>= 1.34.6)
   iptables (3.0.0)
     compat_resource (>= 12.14.3)
   logrotate (2.1.0)
     compat_resource (>= 0.0.0)
+  mariadb (0.3.1)
+    apt (>= 0.0.0)
+    yum (>= 0.0.0)
+    yum-epel (>= 0.0.0)
   mingw (1.2.4)
     compat_resource (>= 0.0.0)
     seven_zip (>= 0.0.0)
   multipackage (3.0.28)
     compat_resource (>= 0.0.0)
-  mysql (5.6.3)
+  mysql (7.2.0)
+    smf (>= 0.0.0)
     yum-mysql-community (>= 0.0.0)
-  mysql-chef_gem (0.0.5)
+  mysql2_chef_gem (1.1.0)
     build-essential (>= 0.0.0)
-    mysql (>= 0.0.0)
+    mariadb (>= 0.0.0)
+    mysql (>= 6.0)
   nscd (4.1.0)
     compat_resource (>= 0.0.0)
   ntp (3.2.0)
-  ohai (4.2.2)
-    compat_resource (>= 12.14)
   openssh (2.1.0)
     iptables (>= 1.0)
-  openssl (4.4.0)
-    chef-sugar (>= 3.1.1)
+  openssl (6.0.0)
   php (1.5.0)
     build-essential (>= 0.0.0)
     iis (>= 0.0.0)
@@ -80,25 +106,22 @@ GRAPH
     windows (>= 0.0.0)
     xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  postgresql (4.0.6)
+  postgresql (3.4.16)
     apt (>= 1.9.0)
     build-essential (>= 0.0.0)
-    openssl (~> 4.0)
+    openssl (>= 0.0.0)
+  rbac (1.0.3)
   resolver (1.3.1)
   selinux (0.9.0)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
+  smf (2.2.8)
+    rbac (>= 1.0.1)
   sudo (3.0.0)
   ubuntu (2.0.0)
     apt (>= 0.0.0)
   users (4.0.1)
-  webapp (0.1.0)
-    apache2 (~> 3.2.2)
-    database (~> 2.3.1)
-    mysql (~> 5.6.3)
-    php (~> 1.5.0)
   windows (2.0.2)
-  xfs (2.0.1)
   xml (3.0.0)
     build-essential (>= 0.0.0)
   yum (4.0.0)
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
new file mode 100644
index 0000000000..641f2f91e3
--- /dev/null
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
@@ -0,0 +1,9 @@
+name "awesome_customers_rhel_wrapper"
+maintainer "The Authors"
+maintainer_email "you@example.com"
+license "all_rights"
+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
new file mode 100644
index 0000000000..058ee61617
--- /dev/null
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
@@ -0,0 +1,6 @@
+#
+# Cookbook Name:: awesome_customers_rhel
+# Recipe:: default
+#
+# Copyright (c) 2016 The Authors, All Rights Reserved.
+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
new file mode 100644
index 0000000000..429fce2f64
--- /dev/null
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
@@ -0,0 +1,9 @@
+name "awesome_customers_ubuntu_wrapper"
+maintainer "The Authors"
+maintainer_email "you@example.com"
+license "all_rights"
+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
new file mode 100644
index 0000000000..93012d295f
--- /dev/null
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
@@ -0,0 +1,6 @@
+#
+# Cookbook Name:: awesome_customers_ubuntu
+# Recipe:: default
+#
+# Copyright (c) 2016 The Authors, All Rights Reserved.
+include_recipe "awesome_customers_ubuntu::default"