Update the Travis kitchen testing to match Chef 14

Yank the awesome customers stuff that's never coming back
Update the kitchen configs with the latest setup bits
Rename the recipe to end_to_end

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

30 files changed, 82 insertions, 354 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 30af2ea6d8..6fb83ff6ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,12 +14,22 @@ environment:
 
 clone_folder: c:\projects\chef
 clone_depth: 1
+
+skip_commits:
+  # version bumps by Expeditor happen as a separate commit after the merge, we can skip
+  message: /Bump version to [0-9.]+ by Chef Expeditor/
+  # if ONLY the files listed below are changed in a commit, skip
+  files:
+    - MAINTAINERS.md
+    - MAINTAINERS.toml
+    - CHANGELOG.md
+    - RELEASE_NOTES.md
+
 skip_tags: true
 branches:
   only:
     - master
     - chef-13
-    - chef-12
 
 install:
   - systeminfo
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index 22f838d83e..e7438cd1d5 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,9 +1,3 @@
 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 "end_to_end", path: "cookbooks/end_to_end"
\ No newline at end of file
diff --git a/kitchen-tests/README.md b/kitchen-tests/README.md
index 2d03b19b62..95234ca383 100644
--- a/kitchen-tests/README.md
+++ b/kitchen-tests/README.md
@@ -1,18 +1,16 @@
 # End-To-End Testing for Chef Client
-Here we seek to provide end-to-end testing of Chef Client through cookbooks which
-exercise many of the available resources, providers, and common patterns. The cookbooks
-here are designed to ensure certain capabilities remain functional with updates
-to the client code base.
+
+Here we seek to provide end-to-end testing of Chef Client through cookbooks which exercise many of the available resources, providers, and common patterns. The cookbooks here are designed to ensure certain capabilities remain functional with updates to the client code base.
 
 ## Getting started
+
 All the gems needed to run these tests can be installed with Bundler.
 
 ```shell
 chef/kitchen-tests$ bundle install
 ```
 
-To ensure everything is working properly, and to see which platforms can have tests
-executed on them, run
+To ensure everything is working properly, and to see which platforms can have tests executed on them, run
 
 ```shell
 chef/kitchen-tests$ bundle exec kitchen list
@@ -21,69 +19,55 @@ chef/kitchen-tests$ bundle exec kitchen list
 You should see output similar to
 
 ```shell
-Instance            Driver    Provisioner  Last Action
-webapp-ubuntu-1204  Vagrant   ChefSolo     <Not Created>
+Instance                     Driver   Provisioner  Verifier  Transport  Last Action    Last Error
+end-to-end-amazonlinux       Vagrant  ChefGithub   Inspec    Ssh        <Not Created>  <None>
 ```
 
 ## Testing
-We use Test Kitchen to build instances, test client code, and destroy instances. If
-you are unfamiliar with Test Kitchen we recommend checking out the [tutorial](http://kitchen.ci/)
-along with the `kitchen-vagrant` [driver documentation](https://github.com/test-kitchen/kitchen-vagrant).
-Test Kitchen is configured to manipulate instances using [Vagrant](http://www.vagrantup.com/)
-when testing locally, and [Amazon EC2](http://aws.amazon.com/ec2/) when testing
-pull requests on [Travis CI](https://travis-ci.com).
+
+We use Test Kitchen to build instances, test client code, and destroy instances. If you are unfamiliar with Test Kitchen we recommend checking out the [tutorial](http://kitchen.ci/) along with the `kitchen-vagrant` [driver documentation](https://github.com/test-kitchen/kitchen-vagrant). Test Kitchen is configured to manipulate instances using [Vagrant](https://www.vagrantup.com/) when testing locally, and Docker via [kitchen-dokken](https://github.com/someara/kitchen-dokken/) when testing pull requests on [Travis CI](https://travis-ci.com/).
 
 ### Commands
-Kitchen instances are led through a series of states. The instance states, and the actions
-taken to transition into each state, are in order:
-* `destroy`: Delete all information for and terminate one or more instances.
-  * This is equivalent to running `vagrant destroy` to stop and delete a Vagrant machine.
-* `create`: Start one or more instances.
-  * This is equivalent to running `vagrant up --no-provision` to start a Vagrant instance.
-* `converge`: Use a provisioner to configure one or more instances.
-  * By default, Test Kitchen is configured to use the `ChefSolo` provisioner which:
-    * Prepares local files for transfer,
-    * Installs the latest release of Chef Omnibus,
-    * Downloads Chef Client source code from the prescribed GitHub repository and reference,
-    * Builds and installs a `chef` gem from the downloaded source,
-    * Runs `chef-client`.
-* `setup`: Prepare to run automated tests. Installs `busser` and related gems on one or more instances.
-* `verify`: Run automated tests on one or more instances.
-
-When transitioning between states, actions for any and all intermediate states will performed.
-Executing the `create` then the `verify` commands is equivalent to executing `create`, `converge`,
-`setup`, and `verify` one-by-one and in order. The only exception is `destroy`, which will
-immediately transfer that machine's state to destroyed.
-
-The `test` command takes one or more instances through all the states, in order: `destroy`, `create`,
-`converge`, `setup`, `verify`, `destroy`.
-
-To see a list of available commands, type `bundle exec kitchen help`. To see more information
-about a particular command, type `bundle exec kitchen help <command>`.
+
+Kitchen instances are led through a series of states. The instance states, and the actions taken to transition into each state, are in order:
+
+- `destroy`: Delete all information for and terminate one or more instances. 
+	- This is equivalent to running `vagrant destroy` to stop and delete a Vagrant machine.
+- `create`: Start one or more instances. 
+	- This is equivalent to running `vagrant up --no-provision` to start a Vagrant instance.
+- `converge`: Use a provisioner to configure one or more instances.
+  - By default, Test Kitchen is configured to use the `ChefSolo` provisioner which:
+    - Prepares local files for transfer,
+    - Installs the latest release of Chef Omnibus,
+    - Downloads Chef Client source code from the prescribed GitHub repository and reference,
+    - Builds and installs a `chef` gem from the downloaded source,
+    - Runs `chef-client`.
+- `setup`: Prepare the instance to run automated tests.
+- `verify`: Run automated tests on one or more instances.
+
+When transitioning between states, actions for any and all intermediate states will performed. Executing the `create` then the `verify` commands is equivalent to executing `create`, `converge`, `setup`, and `verify` one-by-one and in order. The only exception is `destroy`, which will immediately transfer that machine's state to destroyed.
+
+The `test` command takes one or more instances through all the states, in order: `destroy`, `create`, `converge`, `setup`, `verify`, `destroy`.
+
+To see a list of available commands, type `bundle exec kitchen help`. To see more information about a particular command, type `bundle exec kitchen help <command>`.
 
 ### Configuring your tests
-Test Kitchen is configured for local testing in the `.kitchen.yml` file which resides in this directory.
-You will need to configure the provisioner before running the tests.
 
-The provisioner can be configured to pull client source code from a GitHub repository using any
-valid Git reference. You are encouraged to modify any of these settings, but please return them
-to their original values before submitting a pull request for review (unless, of course, your
-changes are enhancements to the default provisioner settings).
+Test Kitchen is configured for local testing in the `kitchen.yml` file which resides in this directory. You will need to configure the provisioner before running the tests.
+
+The provisioner can be configured to pull client source code from a GitHub repository using any valid Git reference. You are encouraged to modify any of these settings, but please return them to their original values before submitting a pull request for review (unless, of course, your changes are enhancements to the default provisioner settings).
 
-By default, the provisioner is configured to pull your most recent commit to `opscode/chef`. You
-can change this by modifying the `github` and `branch` provisioner options:
-* `github`: Set this to `"<your_username>/<your_chef_repo>"`. The default is `"opscode/chef"`.
-* `branch`: This can be any valid git reference (e.g., branch name, tag, or commit SHA). If omitted, it defaults to `master`.
+By default, the provisioner is configured to pull your most recent commit to `chef/chef`. You can change this by modifying the `github` and `branch` provisioner options:
+
+- `github`: Set this to `"<your_username>/<your_chef_repo>"`. The default is `"chef/chef"`.
+- `branch`: This can be any valid git reference (e.g., branch name, tag, or commit SHA). If omitted, it defaults to `master`.
 
 The branch you choose must be accessible on GitHub. You cannot use a local commit at this time.
 
 ### Testing pull requests
-These end-to-end tests are also configured to run with Travis on EC2 instances when you submit a pull request
-to `opscode/chef`. Kitchen is configured to pull chef client source code from the branch it is testing. There
-is no need to modify `.kitchen.travis.yml` unless you are contributing tests.
+
+These end-to-end tests are also configured to run on Travis-CI with docker containers when you submit a pull request to `chef/chef`. Kitchen is configured to pull chef client source code from the branch it is testing. There is no need to modify `kitchen.travis.yml` unless you are contributing tests.
 
 ## Contributing
-We would love to fill out our end-to-end testing coverage! If you have cookbooks and tests that you would
-like to see become a part of client testing, we encourage you to submit a pull request with your additions.
-We request that you do not add platforms to `.kitchen.travis.yml`. Please file a request to add a
-platform under [Issues](https://github.com/opscode/chef/issues).
+
+We would love to fill out our end-to-end testing coverage! If you have cookbooks and tests that you would like to see become a part of client testing, we encourage you to submit a pull request with your additions. We request that you do not add platforms to `kitchen.travis.yml`. Please file a request to add a platform under [Issues](https://github.com/chef/chef/issues).
diff --git a/kitchen-tests/cookbooks/audit_test/.kitchen.yml b/kitchen-tests/cookbooks/audit_test/.kitchen.yml
deleted file mode 100644
index be11e33081..0000000000
--- a/kitchen-tests/cookbooks/audit_test/.kitchen.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-driver:
-  name: vagrant
-
-provisioner:
-  name: chef_zero
-
-platforms:
-  - name: ubuntu-12.04
-  - name: centos-6.5
-
-suites:
-  - name: default
-    run_list:
-      - recipe[audit_test::default]
-    attributes:
diff --git a/kitchen-tests/cookbooks/audit_test/Berksfile.lock b/kitchen-tests/cookbooks/audit_test/Berksfile.lock
deleted file mode 100644
index ef9f28a3be..0000000000
--- a/kitchen-tests/cookbooks/audit_test/Berksfile.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-DEPENDENCIES
-  audit_test
-    path: .
-    metadata: true
-
-GRAPH
-  audit_test (0.1.0)
diff --git a/kitchen-tests/cookbooks/audit_test/README.md b/kitchen-tests/cookbooks/audit_test/README.md
deleted file mode 100644
index 75e2f44808..0000000000
--- a/kitchen-tests/cookbooks/audit_test/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# audit_test
-
-This cookbook has some basic recipes to test audit mode.
-
-In order to run these tests on your dev box:
-
-```
-$ bundle install
-$ bundle exec chef-client -c kitchen-tests/.chef/client.rb -z -o audit_test::default -l debug
-```
-
-Expected JSON output for the tests will be printed to `debug` log.
diff --git a/kitchen-tests/cookbooks/audit_test/metadata.rb b/kitchen-tests/cookbooks/audit_test/metadata.rb
deleted file mode 100644
index 2b34ce28d0..0000000000
--- a/kitchen-tests/cookbooks/audit_test/metadata.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-name             "audit_test"
-maintainer       "The Authors"
-maintainer_email "you@example.com"
-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/audit_test/recipes/default.rb b/kitchen-tests/cookbooks/audit_test/recipes/default.rb
deleted file mode 100644
index 886c2cd0ac..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/default.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: default
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-control_group "basic control group" do
-  control "basic math" do
-    it "should pass" do
-      expect(2 - 2).to eq(0)
-    end
-  end
-end
-
-control_group "control group without top level control" do
-  it "should pass" do
-    expect(2 - 2).to eq(0)
-  end
-end
-
-control_group "control group with empty control" do
-  control "empty"
-end
-
-control_group "empty control group with block" do
-end
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/error_duplicate_control_groups.rb b/kitchen-tests/cookbooks/audit_test/recipes/error_duplicate_control_groups.rb
deleted file mode 100644
index 2b5b8b5d22..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/error_duplicate_control_groups.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: error_duplicate_control_groups
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-control_group "basic control group" do
-  it "should pass" do
-    expect(2 - 2).to eq(0)
-  end
-end
-
-control_group "basic control group" do
-  it "should pass" do
-    expect(2 - 2).to eq(0)
-  end
-end
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/error_no_block.rb b/kitchen-tests/cookbooks/audit_test/recipes/error_no_block.rb
deleted file mode 100644
index e4c444e8bc..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/error_no_block.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: error_no_block
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-control_group "empty control group without block"
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/error_orphan_control.rb b/kitchen-tests/cookbooks/audit_test/recipes/error_orphan_control.rb
deleted file mode 100644
index 61d809a7c0..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/error_orphan_control.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: error_orphan_control
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-control_group "basic control group" do
-  it "should pass" do
-    expect(2 - 2).to eq(0)
-  end
-end
-
-control "orphan control"
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/failed_specs.rb b/kitchen-tests/cookbooks/audit_test/recipes/failed_specs.rb
deleted file mode 100644
index 9e6adfe2e9..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/failed_specs.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: failed_specs
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-control_group "basic control group" do
-  control "basic math" do
-    # Can not write a good control :(
-    it "should pass" do
-      expect(2 - 0).to eq(0)
-    end
-  end
-end
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/serverspec_collision.rb b/kitchen-tests/cookbooks/audit_test/recipes/serverspec_collision.rb
deleted file mode 100644
index 36dd714cef..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/serverspec_collision.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: serverspec_collision
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-file "/tmp/audit_test_file" do
-  action :create
-  content "Welcome to audit mode."
-end
-
-control_group "file auditing" do
-  describe "test file" do
-    it "says welcome" do
-      expect(file("/tmp/audit_test_file")).to contain("Welcome")
-    end
-  end
-end
-
-file "/tmp/audit_test_file_2" do
-  action :create
-  content "Bye to audit mode."
-end
-
-control_group "end file auditing" do
-  describe "end file" do
-    it "says bye" do
-      expect(file("/tmp/audit_test_file_2")).to contain("Bye")
-    end
-  end
-end
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/serverspec_support.rb b/kitchen-tests/cookbooks/audit_test/recipes/serverspec_support.rb
deleted file mode 100644
index fc44fb334e..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/serverspec_support.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: serverspec_support
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-file "/tmp/audit_test_file" do
-  action :create
-  content "Welcome to audit mode."
-end
-
-# package "curl" do
-#   action :install
-# end
-
-control_group "serverspec helpers with types" do
-  control "file helper" do
-    it "says welcome" do
-      expect(file("/tmp/audit_test_file")).to contain("Welcome")
-    end
-  end
-
-  control service("com.apple.CoreRAID") do
-    it { is_expected.to be_enabled }
-    it { is_expected.not_to be_running }
-  end
-
-  # describe "package helper" do
-  #   it "works" do
-  #     expect(package("curl")).to be_installed
-  #   end
-  # end
-
-  control package("postgresql") do
-    it { is_expected.to_not be_installed }
-  end
-end
diff --git a/kitchen-tests/cookbooks/audit_test/recipes/with_include_recipe.rb b/kitchen-tests/cookbooks/audit_test/recipes/with_include_recipe.rb
deleted file mode 100644
index 7727c573c7..0000000000
--- a/kitchen-tests/cookbooks/audit_test/recipes/with_include_recipe.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Cookbook Name:: audit_test
-# Recipe:: with_include_recipe
-#
-# Copyright 2014-2016, The Authors, All Rights Reserved.
-
-include_recipe "audit_test::serverspec_collision"
-
-control_group "basic example" do
-  it "should pass" do
-    expect(2 - 2).to eq(0)
-  end
-end
-
-include_recipe "audit_test::serverspec_collision"
-include_recipe "audit_test::default"
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"
diff --git a/kitchen-tests/cookbooks/base/Berksfile b/kitchen-tests/cookbooks/base/Berksfile
deleted file mode 100644
index 967b9a78b6..0000000000
--- a/kitchen-tests/cookbooks/base/Berksfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://supermarket.chef.io"
-
-metadata
diff --git a/kitchen-tests/cookbooks/audit_test/Berksfile b/kitchen-tests/cookbooks/end_to_end/Berksfile
index 967b9a78b6..967b9a78b6 100644
--- a/kitchen-tests/cookbooks/audit_test/Berksfile
+++ b/kitchen-tests/cookbooks/end_to_end/Berksfile
diff --git a/kitchen-tests/cookbooks/base/README.md b/kitchen-tests/cookbooks/end_to_end/README.md
index 2889a2d0dc..f9bc150e61 100644
--- a/kitchen-tests/cookbooks/base/README.md
+++ b/kitchen-tests/cookbooks/end_to_end/README.md
@@ -1,3 +1,3 @@
-# base
+# end_to_end
 
 A standard chef "base" cookbook that performs various base system configuration tasks using common community cookbooks.
diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
index c952f0887e..c952f0887e 100644
--- a/kitchen-tests/cookbooks/base/attributes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
diff --git a/kitchen-tests/cookbooks/base/libraries/chef-sugar.rb b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
index 90d02a361f..90d02a361f 100644
--- a/kitchen-tests/cookbooks/base/libraries/chef-sugar.rb
+++ b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/end_to_end/metadata.rb
index 9d4e663bec..ec2f4f2dde 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/end_to_end/metadata.rb
@@ -1,10 +1,7 @@
-name             "base"
-maintainer       ""
-maintainer_email ""
+name             "end_to_end"
 license          "Apache-2.0"
 description      "Installs/Configures base"
-long_description "Installs/Configures base"
-version          "0.1.0"
+version          "1.0.0"
 
 gem              "chef-sugar"
 
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
index 8b0eac0e6e..b06aff28f3 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: default
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, Chef Software, Inc.
 #
 
 hostname "chef-travis-ci.chef.io"
@@ -25,7 +25,7 @@ yum_repository "epel" do
   only_if { platform_family?("rhel") }
 end
 
-include_recipe "build-essential"
+build_essential "compilation tools"
 
 include_recipe "::packages"
 
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb
index f8ceb342ad..069487486f 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: packages
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, 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
diff --git a/kitchen-tests/cookbooks/base/recipes/tests.rb b/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb
index c6095eaeb5..1c9171b9f3 100644
--- a/kitchen-tests/cookbooks/base/recipes/tests.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook:: base
+# Cookbook:: end_to_end
 # Recipe:: tests
 #
-# Copyright:: 2014-2017, Chef Software, Inc.
+# Copyright:: 2014-2018, Chef Software, Inc.
 #
 
 #
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 3d977c9306..c78dae74db 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -34,17 +34,14 @@ platforms:
     image: dokken/amazonlinux
     pid_one_command: /sbin/init
     intermediate_instructions:
-      - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
-- name: debian-7
+- name: amazonlinux-2
   driver:
-    image: dokken/debian-7
-    pid_one_command: /sbin/init
+    image: dokken/amazonlinux-2
+    pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
-      - RUN /bin/mkdir /var/run/sshd
+      - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: debian-8
   driver:
@@ -52,7 +49,6 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: debian-9
   driver:
@@ -60,14 +56,12 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: centos-6
   driver:
     image: dokken/centos-6
     pid_one_command: /sbin/init
     intermediate_instructions:
-      - RUN yum -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: centos-7
@@ -75,7 +69,7 @@ platforms:
     image: dokken/centos-7
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN yum -y install sudo
+      - RUN yum -y install e2fsprogs
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: fedora-latest
@@ -83,7 +77,6 @@ platforms:
     image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN dnf -y install sudo
       - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults    !requiretty/g" /etc/sudoers
 
 - name: ubuntu-14.04
@@ -92,7 +85,6 @@ platforms:
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
 
 - name: ubuntu-16.04
   driver:
@@ -100,24 +92,23 @@ platforms:
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get -y install sudo
+
+- name: ubuntu-18.04
+  driver:
+    image: dokken/ubuntu-18.04
+    pid_one_command: /bin/systemd
+    intermediate_instructions:
+      - RUN /usr/bin/apt-get update
 
 - name: opensuse-leap
   driver:
     image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
     intermediate_instructions:
-      - RUN /usr/bin/zypper install -y sudo
+      - RUN /usr/bin/zypper --non-interactive update
+      - RUN /usr/bin/zypper --non-interactive install cron
 
 suites:
-  - name: base
-    run_list:
-      - recipe[base::default]
-  - name: awesome_customers_ubuntu
-    includes: [ubuntu-14.04, ubuntu-16.04]
-    run_list:
-      - recipe[awesome_customers_ubuntu_wrapper::default]
-  - name: awesome_customers_rhel
-    includes: [centos-6, centos-7]
+  - name: end-to-end
     run_list:
-      - recipe[awesome_customers_rhel_wrapper::default]
+      - recipe[end_to_end::default]
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/kitchen.yml
index 86cafe3db0..85d5328567 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -26,22 +26,14 @@ platforms:
       box: mvbcoding/awslinux
   - name: centos-6
   - name: centos-7
-  - name: debian-7
   - name: debian-8
   - name: debian-9
   - name: opensuse-leap-42
   - name: ubuntu-14.04
   - name: ubuntu-16.04
+  - name: ubuntu-18.04
 
 suites:
-  - name: base
+  - name: end-to-end
     run_list:
-      - recipe[base::default]
-  - name: awesome_customers_ubuntu
-    includes: [ubuntu-14.04, ubuntu-16.04]
-    run_list:
-      - recipe[awesome_customers_ubuntu_wrapper::default]
-  - name: awesome_customers_rhel
-    includes: [centos-6, centos-7]
-    run_list:
-      - recipe[awesome_customers_rhel_wrapper::default]
+      - recipe[end_to_end::default]