Merge pull request #6414 from chef/travis_integration

Update dokken integration testing: dokken images, updated cookbook, debian 9

18 files changed, 149 insertions, 191 deletions

diff --git a/.travis.yml b/.travis.yml
index e07a56dbbd..20bc47889f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,25 +31,25 @@ env:
 
 matrix:
   include:
-  - rvm: 2.3.3
+  - rvm: 2.3.5
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.4.1
+    rvm: 2.4.2
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.4.1
+    rvm: 2.4.2
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
@@ -59,39 +59,39 @@ matrix:
   - env:
       TEST_GEM: sethvargo/chef-sugar
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       PEDANT_OPTS: --skip-oc_id
       TEST_GEM: chef/chef-zero
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec cheffs
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: chef/cheffish
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: chefspec/chefspec
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: foodcritic/foodcritic
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake test
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: poise/halite
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.1
+    rvm: 2.4.2
   - env:
       TEST_GEM: poise/poise
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.1
+    rvm: 2.4.2
   ### START TEST KITCHEN ONLY ###
   #
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -109,7 +109,7 @@ matrix:
     env:
       - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -127,7 +127,7 @@ matrix:
     env:
       - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -145,7 +145,7 @@ matrix:
     env:
       - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -163,7 +163,25 @@ matrix:
     env:
       - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
+  - rvm: 2.4.2
+    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 ci docgen guard integration maintenance omnibus_package --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-debian-9
+    after_failure:
+      - cat .kitchen/logs/kitchen.log
+    env:
+      - DEBIAN=9
+      - KITCHEN_YAML=.kitchen.travis.yml
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -181,7 +199,7 @@ matrix:
     env:
       - CENTOS=6
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -199,7 +217,7 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.4.1
+# - rvm: 2.4.2
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -217,25 +235,25 @@ matrix:
 #    env:
 #      - FEDORA=latest
 #      - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.4.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 ci docgen guard integration maintenance omnibus_package --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.4.1
+# - rvm: 2.4.2
+#   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 ci docgen guard integration maintenance omnibus_package --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.4.2
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -253,7 +271,7 @@ matrix:
 #    env:
 #      - AWESOME_CUSTOMERS_UBUNTU=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
-#  - rvm: 2.4.1
+#  - rvm: 2.4.2
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -272,7 +290,7 @@ matrix:
 #      - AWESOME_CUSTOMERS_RHEL=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
 #    ### END TEST KITCHEN ONLY ###
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     sudo: required
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
@@ -292,7 +310,7 @@ matrix:
       - sudo cat /var/log/squid3/cache.log
       - sudo cat /var/log/squid3/access.log
   allow_failures:
-  - rvm: 2.4.1
+  - rvm: 2.4.2
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -316,7 +334,7 @@ matrix:
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.1
+    rvm: 2.4.2
 
 notifications:
   on_change: true
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 658851beb6..161f227518 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -31,38 +31,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:
@@ -70,52 +67,47 @@ 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-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:
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 87981781db..342b547cab 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -24,10 +24,8 @@ provisioner:
 platforms:
   - 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
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 9a2df463fc..3996a4aa37 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,12 +1,8 @@
 source "https://supermarket.chef.io"
 
-#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"
-
 # 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"
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 3d6e8d15c0..7bf9e1164a 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.5.0)
     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.1.0)
   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/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 d29665d598..9a85a0e24b 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -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     ">= 13"
+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 d8dbb9fe41..0c8341ca9a 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -7,12 +7,12 @@
 
 hostname "chef-travis-ci.chef.io"
 
-if node["platform_family"] == "debian"
+if platform_family?("debian")
   include_recipe "ubuntu"
-  apt_update "packages"
+  apt_update
 end
 
-if %w{rhel fedora}.include?(node["platform_family"])
+if platform_family?("rhel", "fedora", "amazon")
   include_recipe "selinux::disabled"
 end
 
@@ -23,7 +23,7 @@ yum_repository "epel" do
   gpgkey "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
   gpgcheck true
   mirrorlist "https://mirrors.fedoraproject.org/metalink?repo=epel-#{node['platform_version'].to_i}&arch=$basearch"
-  only_if { node["platform_family"] == "rhel" && node["platform"] != "amazon" }
+  only_if { platform_family?("rhel") }
 end
 
 include_recipe "build-essential"
@@ -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/webapp/Berksfile b/kitchen-tests/cookbooks/webapp/Berksfile
index ba11c46c1d..967b9a78b6 100644
--- a/kitchen-tests/cookbooks/webapp/Berksfile
+++ b/kitchen-tests/cookbooks/webapp/Berksfile
@@ -1,5 +1,3 @@
 source "https://supermarket.chef.io"
 
 metadata
-
-cookbook "apt"
diff --git a/kitchen-tests/cookbooks/webapp/README.md b/kitchen-tests/cookbooks/webapp/README.md
index f19ab46735..caa0059689 100644
--- a/kitchen-tests/cookbooks/webapp/README.md
+++ b/kitchen-tests/cookbooks/webapp/README.md
@@ -1,3 +1,3 @@
 # webapp
 
-TODO: Enter the cookbook description here.
+A test cookbook that setups up a sample webapp to exercise a common workflow for chef cookbooks.
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
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/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.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..900fbe4836 100644
--- a/kitchen-tests/test/fixtures/serverspec_helper.rb
+++ b/kitchen-tests/test/fixtures/serverspec_helper.rb
@@ -1,4 +1,4 @@
-# Shamelessly copied from https://github.com/onehealth-cookbooks/apache2/blob/master/test/fixtures/serverspec_helper.rb
+# Shamelessly copied from https://github.com/sous-chefs/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.