Bring in the integration test updates that we done to Chef 13

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

31 files changed, 82 insertions, 345 deletions

diff --git a/.travis.yml b/.travis.yml
index 7a897b7f75..83b00830f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,11 +119,11 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-ubuntu-1204
+      - bundle exec kitchen test base-ubuntu-1404
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
-      - UBUNTU=12.04
+      - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
@@ -137,11 +137,11 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-ubuntu-1404
+      - bundle exec kitchen test base-ubuntu-1604
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
-      - UBUNTU=14.04
+      - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
@@ -155,11 +155,11 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-ubuntu-1604
+      - bundle exec kitchen test base-debian-7
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
-      - UBUNTU=16.04
+      - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
@@ -173,11 +173,11 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-debian-7
+      - bundle exec kitchen test base-debian-8
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
-      - DEBIAN=7
+      - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
@@ -191,12 +191,11 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - 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
+      - bundle exec kitchen test base-debian-9
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
-      - DEBIAN=8
+      - DEBIAN=9
       - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
@@ -210,7 +209,7 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-centos-6
+      - bundle exec kitchen test base-centos-6
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
@@ -228,49 +227,12 @@ matrix:
       - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
       - cd kitchen-tests
     script:
-      - bundle exec kitchen test webapp-centos-7
+      - bundle exec kitchen test base-centos-7
     after_failure:
       - cat .kitchen/logs/kitchen.log
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.3.3
-#    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 webapp-fedora-latest
-#    after_failure:
-#      - cat .kitchen/logs/kitchen.log
-#    env:
-#      - FEDORA=latest
-#      - KITCHEN_YAML=.kitchen.travis.yml
-# can re-enable amazonlinux when we get a build in current that contains the crypto libs added in #5687
-#  - rvm: 2.3.3
-#    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:
-#      - travis_wait bundle exec kitchen test webapp-amazonlinux
-#    after_failure:
-#      - cat .kitchen/logs/kitchen.log
-#    env:
-#      - AMAZONLINUX=LATEST
-#      - KITCHEN_YAML=.kitchen.travis.yml
   - rvm: 2.3.3
     services: docker
     sudo: required
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index aae5202457..394eb6795b 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -27,38 +27,35 @@ verifier:
 platforms:
 - name: debian-7
   driver:
-    image: debian:7
+    image: dokken/debian-7
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
+      - RUN /usr/bin/apt-get -y install sudo
       - RUN /bin/mkdir /var/run/sshd
 
 - name: debian-8
   driver:
-    image: debian:8
+    image: dokken/debian-8
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
+      - RUN /usr/bin/apt-get -y install sudo
 
-- name: centos-5
+- name: debian-9
   driver:
-    image: centos:5
-    platform: rhel
-    run_command: /sbin/init
+    image: dokken/debian-9
+    pid_one_command: /bin/systemd
     intermediate_instructions:
-      - RUN yum clean all
-      - RUN yum install -y which initscripts net-tools sudo wget
-      - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
+      - RUN /usr/bin/apt-get update
+      - RUN /usr/bin/apt-get -y install sudo
 
 - name: centos-6
   driver:
-    image: centos:6
+    image: dokken/centos-6
     run_command: /sbin/init
     intermediate_instructions:
-      - RUN yum clean all
-      - RUN yum -y install which initscripts net-tools sudo wget
+      - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
   attributes:
     chef_client:
@@ -66,64 +63,51 @@ platforms:
 
 - name: centos-7
   driver:
-    image: centos:7
+    image: dokken/centos-7
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN yum clean all
-      - RUN yum -y install which initscripts net-tools sudo wget
+      - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: fedora-latest
   driver:
-    image: fedora:latest
+    image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN dnf -y install yum which initscripts rpm-build zlib-devel net-tools sudo wget
-      - RUN yum makecache
+      - RUN dnf -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
-- name: ubuntu-12.04
-  driver:
-    image: ubuntu-upstart:12.04
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
-
 - name: ubuntu-14.04
   driver:
-    image: ubuntu-upstart:14.04
+    image: dokken/ubuntu-14.04
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
+      - RUN /usr/bin/apt-get -y install sudo
 
 - name: ubuntu-16.04
   driver:
-    image: ubuntu:16.04
+    image: dokken/ubuntu-16.04
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install zlib1g-dev sudo net-tools wget ca-certificates
+      - RUN /usr/bin/apt-get -y install sudo
 
-- name: opensuse-13.2
+- name: opensuse-leap
   driver:
-    image: opensuse:13.2
+    image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
-    intermediate_instructions:
-      - RUN zypper refresh
 
 - name: amazonlinux
   driver:
-    image: amazonlinux:latest
+    image: dokken/amazonlinux
     pid_one_command: /sbin/init
     intermediate_instructions:
-      - RUN yum clean all
-      - RUN yum -y install which initscripts net-tools sudo wget
+      - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 suites:
-  - name: webapp
+  - name: base
     run_list:
       - recipe[base::default]
   - name: awesome_customers_ubuntu
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index d6df77932a..5b14730a92 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -21,16 +21,13 @@ provisioner:
     diff_disabled: true
 
 platforms:
-  - name: ubuntu-12.04
   - name: ubuntu-14.04
   - name: ubuntu-16.04
-  - name: centos-7.2
-  - name: centos-6.7
-  # needs fixing for 5.11
-  # - name: centos-5.11
+  - name: centos-7
+  - name: centos-6
 
 suites:
-  - name: webapp
+  - name: base
     run_list:
       - recipe[base::default]
   - name: awesome_customers_ubuntu
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 5319e45a19..d4b16d2e82 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,12 +1,7 @@
 source "https://supermarket.chef.io"
 
-#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"
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 707a38a7f6..e41d2ff808 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
+gem "chef-config", "< 13"
 gem "rake" # required to build some native extensions
 gem "berkshelf"
 gem "kitchen-appbundle-updater"
diff --git a/kitchen-tests/cookbooks/audit_test/metadata.rb b/kitchen-tests/cookbooks/audit_test/metadata.rb
index 3fbda5dbe1..2b34ce28d0 100644
--- a/kitchen-tests/cookbooks/audit_test/metadata.rb
+++ b/kitchen-tests/cookbooks/audit_test/metadata.rb
@@ -1,7 +1,7 @@
 name             "audit_test"
 maintainer       "The Authors"
 maintainer_email "you@example.com"
-license          "all_rights"
+license          "Apache-2.0"
 description      "Installs/Configures audit_test"
 long_description "Installs/Configures audit_test"
 version          "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
index 641f2f91e3..49dbb50869 100644
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/metadata.rb
@@ -1,7 +1,7 @@
 name "awesome_customers_rhel_wrapper"
 maintainer "The Authors"
 maintainer_email "you@example.com"
-license "all_rights"
+license "Apache-2.0"
 description "Installs/Configures awesome_customers_rhel"
 long_description "Installs/Configures awesome_customers_rhel"
 version "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
index 058ee61617..c58db5fe29 100644
--- a/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_rhel_wrapper/recipes/default.rb
@@ -1,6 +1,8 @@
 #
-# Cookbook Name:: awesome_customers_rhel
+# Cookbook:: awesome_customers_rhel
 # Recipe:: default
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# 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
index 429fce2f64..d07a2c2c13 100644
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/metadata.rb
@@ -1,7 +1,7 @@
 name "awesome_customers_ubuntu_wrapper"
 maintainer "The Authors"
 maintainer_email "you@example.com"
-license "all_rights"
+license "Apache-2.0"
 description "Installs/Configures awesome_customers_ubuntu"
 long_description "Installs/Configures awesome_customers_ubuntu"
 version "0.1.0"
diff --git a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
index 93012d295f..f6fd388f16 100644
--- a/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
+++ b/kitchen-tests/cookbooks/awesome_customers_ubuntu_wrapper/recipes/default.rb
@@ -1,6 +1,8 @@
 #
-# Cookbook Name:: awesome_customers_ubuntu
+# Cookbook:: awesome_customers_ubuntu
 # Recipe:: default
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# Copyright:: 2016-2017, Chef Software, Inc.
+#
+
 include_recipe "awesome_customers_ubuntu::default"
diff --git a/kitchen-tests/cookbooks/base/Berksfile b/kitchen-tests/cookbooks/base/Berksfile
index ba11c46c1d..967b9a78b6 100644
--- a/kitchen-tests/cookbooks/base/Berksfile
+++ b/kitchen-tests/cookbooks/base/Berksfile
@@ -1,5 +1,3 @@
 source "https://supermarket.chef.io"
 
 metadata
-
-cookbook "apt"
diff --git a/kitchen-tests/cookbooks/base/README.md b/kitchen-tests/cookbooks/base/README.md
index f19ab46735..2889a2d0dc 100644
--- a/kitchen-tests/cookbooks/base/README.md
+++ b/kitchen-tests/cookbooks/base/README.md
@@ -1,3 +1,3 @@
-# webapp
+# base
 
-TODO: Enter the cookbook description here.
+A standard chef "base" cookbook that performs various base system configuration tasks using common community cookbooks.
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb
index 32ea03916f..66da34b402 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -1,7 +1,7 @@
 name             "base"
 maintainer       ""
 maintainer_email ""
-license          ""
+license          "Apache-2.0"
 description      "Installs/Configures base"
 long_description "Installs/Configures base"
 version          "0.1.0"
@@ -22,3 +22,14 @@ depends          "selinux"
 depends          "sudo"
 depends          "ubuntu"
 depends          "users"
+
+supports         "ubuntu"
+supports         "debian"
+supports         "redhat"
+supports         "opensuse"
+supports         "fedora"
+supports         "amazon"
+
+chef_version     ">= 12.7"
+issues_url       "https://github.com/chef/chef/issues"
+source_url       "https://github.com/chef/chef"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb
index c25673bef5..06f2d9a386 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -1,13 +1,13 @@
 #
-# Cookbook Name:: webapp
+# Cookbook:: base
 # Recipe:: default
 #
-# Copyright (C) 2014
+# Copyright:: 2014-2017, Chef Software, Inc.
 #
 
 hostname "chef-travis-ci.chef.io"
 
-if node["platform_family"] == "debian"
+if platform_family?("debian")
   include_recipe "ubuntu"
   apt_update "packages"
 end
@@ -34,7 +34,10 @@ include_recipe "ntp"
 
 include_recipe "resolver"
 
-include_recipe "users::sysadmins"
+users_manage "sysadmin" do
+  group_id 2300
+  action [:create]
+end
 
 include_recipe "sudo"
 
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb
index c4457e5945..a448936acd 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/base/recipes/packages.rb
@@ -1,3 +1,9 @@
+#
+# Cookbook:: base
+# Recipe:: packages
+#
+# Copyright:: 2014-2017, Chef Software, Inc.
+#
 
 # this is just a list of package that exist on every O/S we test, and often aren't installed by default.  you don't
 # have to get too clever here, you can delete packages if they don't exist everywhere we test.
diff --git a/kitchen-tests/cookbooks/base/recipes/tests.rb b/kitchen-tests/cookbooks/base/recipes/tests.rb
index 9d9d813865..c6095eaeb5 100644
--- a/kitchen-tests/cookbooks/base/recipes/tests.rb
+++ b/kitchen-tests/cookbooks/base/recipes/tests.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: webapp
-# Recipe:: default
+# Cookbook:: base
+# Recipe:: tests
 #
-# Copyright (C) 2014
+# Copyright:: 2014-2017, Chef Software, Inc.
 #
 
 #
diff --git a/kitchen-tests/cookbooks/webapp/Berksfile b/kitchen-tests/cookbooks/webapp/Berksfile
deleted file mode 100644
index ba11c46c1d..0000000000
--- a/kitchen-tests/cookbooks/webapp/Berksfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source "https://supermarket.chef.io"
-
-metadata
-
-cookbook "apt"
diff --git a/kitchen-tests/cookbooks/webapp/README.md b/kitchen-tests/cookbooks/webapp/README.md
deleted file mode 100644
index f19ab46735..0000000000
--- a/kitchen-tests/cookbooks/webapp/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# webapp
-
-TODO: Enter the cookbook description here.
diff --git a/kitchen-tests/cookbooks/webapp/attributes/default.rb b/kitchen-tests/cookbooks/webapp/attributes/default.rb
deleted file mode 100644
index 2ff7a6c5ff..0000000000
--- a/kitchen-tests/cookbooks/webapp/attributes/default.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-default["apache"]["remote_host_ip"] = "127.0.0.1"
-
-default["webapp"]["database"] = "webapp"
-default["webapp"]["db_username"] = "webapp"
-default["webapp"]["path"] = "/srv/webapp"
-
-# XXX: apache2 cookbook 2.0.0 has bugs around changing the mpm and then attempting a graceful restart
-# which fails and leaves the service down.
-case node["platform"]
-when "ubuntu"
-  if node["platform_version"].to_f >= 14.04
-    default[:apache][:mpm] = "event"
-  end
-end
diff --git a/kitchen-tests/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb
deleted file mode 100644
index 5124aa4f6f..0000000000
--- a/kitchen-tests/cookbooks/webapp/metadata.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-name             "webapp"
-maintainer       ""
-maintainer_email ""
-license          ""
-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"
diff --git a/kitchen-tests/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb
deleted file mode 100644
index 2b3459b794..0000000000
--- a/kitchen-tests/cookbooks/webapp/recipes/default.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Cookbook Name:: webapp
-# Recipe:: default
-#
-# Copyright (C) 2014
-#
-
-include_recipe "apache2"
-include_recipe "database::mysql"
-include_recipe "php"
-
-creds = Hash.new
-%w{mysql webapp}.each do |item_name|
-  creds[item_name] = data_bag_item("passwords", item_name)
-end
-
-web_app "webapp" do
-  server_name "localhost"
-  server_aliases [node["fqdn"], node["hostname"], "localhost.localdomain"]
-  docroot node["webapp"]["path"]
-  cookbook "apache2"
-end
-
-mysql_service "default" do
-  server_root_password creds["mysql"]["server_root_password"]
-  server_repl_password creds["mysql"]["server_repl_password"]
-end
-
-mysql_database node["webapp"]["database"] do
-  connection ({
-    :host => "localhost",
-    :username => "root",
-    :password => creds["mysql"]["server_root_password"],
-  })
-  action :create
-end
-
-mysql_database_user node["webapp"]["db_username"] do
-  connection ({
-    :host => "localhost",
-    :username => "root",
-    :password => creds["mysql"]["server_root_password"],
-  })
-  password creds["webapp"]["db_password"]
-  database_name node["webapp"]["database"]
-  privileges [:select, :update, :insert, :create, :delete]
-  action :grant
-end
-
-directory node["webapp"]["path"] do
-  owner "root"
-  group "root"
-  mode "0755"
-  action :create
-  recursive true
-end
-
-template "#{node['webapp']['path']}/index.html" do
-  source "index.html.erb"
-end
-
-template "#{node['webapp']['path']}/index.php" do
-  source "index.php.erb"
-end
diff --git a/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb b/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb
deleted file mode 100644
index 6da0629b9e..0000000000
--- a/kitchen-tests/cookbooks/webapp/templates/default/index.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-  <body>
-    <h1>Hello, World!</h1>
-  </body>
-</html>
diff --git a/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb b/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb
deleted file mode 100644
index b08b076614..0000000000
--- a/kitchen-tests/cookbooks/webapp/templates/default/index.php.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <title>PHP Test</title>
-  </head>
-  <body>
-    <?php echo '<p>Hello, World!</p>'; ?>
-  </body>
-</html>
diff --git a/kitchen-tests/test/fixtures/platforms/centos/5.json b/kitchen-tests/test/fixtures/platforms/centos/5.json
deleted file mode 100644
index 9d324a2f03..0000000000
--- a/kitchen-tests/test/fixtures/platforms/centos/5.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "httpd",
-    "service_name": "httpd"
-  },
-  "mysql": {
-    "server_package": "mysql-server",
-    "client_package": "mysql",
-    "service_name": "mysqld"
-  },
-  "php" : {
-    "package": "php53"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/platforms/centos/6.json b/kitchen-tests/test/fixtures/platforms/centos/6.json
deleted file mode 100644
index 4f74a3ed4a..0000000000
--- a/kitchen-tests/test/fixtures/platforms/centos/6.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "httpd",
-    "service_name": "httpd"
-  },
-  "mysql": {
-    "server_package": "mysql-server",
-    "client_package": "mysql",
-    "service_name": "mysqld"
-  },
-  "php" : {
-    "package": "php"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json
deleted file mode 100644
index a9677c7ca5..0000000000
--- a/kitchen-tests/test/fixtures/platforms/ubuntu/10.04.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "apache2",
-    "service_name": "apache2"
-  },
-  "mysql": {
-    "server_package": "mysql-server-5.1",
-    "client_package": "mysql-client-5.1",
-    "service_name": "mysql"
-  },
-  "php" : {
-    "package": "php5"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/12.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/12.04.json
deleted file mode 100644
index eab46db2e5..0000000000
--- a/kitchen-tests/test/fixtures/platforms/ubuntu/12.04.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "apache2",
-    "service_name": "apache2"
-  },
-  "mysql": {
-    "server_package": "mysql-server-5.5",
-    "client_package": "mysql-client-5.5",
-    "service_name": "mysql"
-  },
-  "php" : {
-    "package": "php5"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json b/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json
deleted file mode 100644
index eab46db2e5..0000000000
--- a/kitchen-tests/test/fixtures/platforms/ubuntu/14.04.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "apache2",
-    "service_name": "apache2"
-  },
-  "mysql": {
-    "server_package": "mysql-server-5.5",
-    "client_package": "mysql-client-5.5",
-    "service_name": "mysql"
-  },
-  "php" : {
-    "package": "php5"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json b/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json
deleted file mode 100644
index eab46db2e5..0000000000
--- a/kitchen-tests/test/fixtures/platforms/ubuntu/14.10.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apache": {
-    "package": "apache2",
-    "service_name": "apache2"
-  },
-  "mysql": {
-    "server_package": "mysql-server-5.5",
-    "client_package": "mysql-client-5.5",
-    "service_name": "mysql"
-  },
-  "php" : {
-    "package": "php5"
-  }
-}
diff --git a/kitchen-tests/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb
index feb4c21200..a56e00b49e 100644
--- a/kitchen-tests/test/fixtures/serverspec_helper.rb
+++ b/kitchen-tests/test/fixtures/serverspec_helper.rb
@@ -1,32 +1,3 @@
-# Shamelessly copied from https://github.com/onehealth-cookbooks/apache2/blob/master/test/fixtures/serverspec_helper.rb
-# The commented-out platforms in the osmapping hash can be added once we have added them into
-# our .kitchen.yml and .kitchen.travis.yml and added the appropriate JSON under test/fixtures/platforms.
-
 require "serverspec"
-require "json"
-require "ffi_yajl"
-
-set :backend, :exec
-
-include Specinfra::Helper::Properties
-
-require "pp"
-pp os
-
-def load_nodestub
-  case os[:family]
-  when "ubuntu", "debian"
-    platform = os[:family]
-    platform_version = os[:release]
-  when "redhat"
-    platform = "centos"
-    platform_version = os[:release].to_i
-  end
-  FFI_Yajl::Parser.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true)
-end
-
-# centos-59 doesn't have /sbin in the default path,
-# so we must ensure it's on serverspec's path
-set :path, "$PATH:/sbin"
 
-set_property load_nodestub
+set :backend, :exec
\ No newline at end of file
diff --git a/kitchen-tests/test/integration/webapp/default_spec.rb b/kitchen-tests/test/integration/base/default_spec.rb
index cf148218b7..cf148218b7 100644
--- a/kitchen-tests/test/integration/webapp/default_spec.rb
+++ b/kitchen-tests/test/integration/base/default_spec.rb