Cleanup the Test Kitchen setup in omnibus

Unpin cookbook deps
Remove platforms we don't support anymore
Add new platforms
Update instructions for getting setup in Vagrant Cloud
Fold the kitchen files into a single file

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

5 files changed, 21 insertions, 31 deletions

diff --git a/omnibus/Berksfile b/omnibus/Berksfile
index 614c6da643..4e6a878bf4 100644
--- a/omnibus/Berksfile
+++ b/omnibus/Berksfile
@@ -3,10 +3,10 @@ source "https://supermarket.chef.io"
 cookbook "omnibus"
 
 # Uncomment to use the latest version of the Omnibus cookbook from GitHub
-# cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
+# cookbook 'omnibus', github: 'chef-cookbooks/omnibus'
 
 group :integration do
-  cookbook "apt",      "~> 2.3"
-  cookbook "freebsd",  "~> 0.1"
-  cookbook "yum-epel", "~> 0.3"
+  cookbook "apt"
+  cookbook "freebsd"
+  cookbook "yum-epel"
 end
diff --git a/omnibus/README.md b/omnibus/README.md
index 0db2d56448..aa58d6da5e 100644
--- a/omnibus/README.md
+++ b/omnibus/README.md
@@ -58,7 +58,7 @@ $ bundle exec omnibus help
 
 ## Kitchen-based Build Environment
 
-Every Omnibus project ships will a project-specific [Berksfile](https://docs.chef.io/berkshelf.html/) that will allow you to build your omnibus projects on all of the projects listed in the `kitchen.yml`. You can add/remove additional platforms as needed by changing the list found in the `kitchen.yml` `platforms` YAML stanza.
+Every Omnibus project ships will a project-specific [Berksfile](https://docs.chef.io/berkshelf.html) that will allow you to build your omnibus projects on all of the projects listed in the `kitchen.yml`. You can add/remove additional platforms as needed by changing the list found in the `kitchen.yml` `platforms` YAML stanza.
 
 This build environment is designed to get you up-and-running quickly. However, there is nothing that restricts you to building on other platforms. Simply use the [omnibus cookbook](https://github.com/chef-cookbooks/omnibus) to setup your desired platform and execute the build steps listed above.
 
diff --git a/omnibus/kitchen.hyperv.yml b/omnibus/kitchen.hyperv.yml
deleted file mode 100644
index 99fb55680a..0000000000
--- a/omnibus/kitchen.hyperv.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-driver:
-  provider: hyperv
\ No newline at end of file
diff --git a/omnibus/kitchen.vmware.yml b/omnibus/kitchen.vmware.yml
deleted file mode 100644
index 69f001ef97..0000000000
--- a/omnibus/kitchen.vmware.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-driver:
-  name: vagrant
-  provider: vmware_fusion
-  customize:
-    numvcpus: 4
-    memsize: 4096
diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml
index 81aba1de47..aad8222c58 100644
--- a/omnibus/kitchen.yml
+++ b/omnibus/kitchen.yml
@@ -17,10 +17,6 @@ driver:
 
 provisioner:
   name: chef_zero
-  # Always install the latest version of Chef.
-  # This is not the version of chef that we're building - this is the version
-  # of chef that omnibus needs to build chef/chef.
-  require_chef_omnibus: true
   attributes:
     vagrant:
       this_key_exists_so_we_have_a_vagrant_key: true
@@ -39,8 +35,8 @@ platforms:
     run_list: yum-epel::default
   - name: debian-8
     run_list: apt::default
-  - name: freebsd-10
-    run_list: freebsd::portsnap
+  - name: debian-9
+    run_list: apt::default
   - name: freebsd-11
     run_list: freebsd::portsnap
   - name: ubuntu-14.04
@@ -49,31 +45,33 @@ platforms:
     run_list: apt::default
   - name: ubuntu-18.04
     run_list: apt::default
-  # The following (private) boxes are shared via Atlas and are only
+  # The following (private) boxes are shared via Vagrant Cloud and are only
   # available to users working for Chef. Sorry, it's about software licensing.
   #
   # Chef-internal users, you will need to:
-  # 1.  Create an Atlas account:  https://atlas.hashicorp.com/
-  # 2.  Ping #eng-services-support with your Atlas account name
-  #     to be added to the relevant team in Atlas,
-  # 3.  Do `vagrant login` with your Atlas creds so that you can download
-  #     the private boxes.
+  # 1.  Create an Vagrant Cloud account:  http://vagrantcloud.com/
+  # 2.  Ping #releng-support with your account name to be added to the relevant team.
+  # 3.  Do `vagrant login` with your creds so that you can download the private boxes.
   #
-  # The Mac OS X boxes are VMware only also. You can enable VMware Fusion
+  # The macOS boxes are VMware only also. You can enable VMware Fusion
   # by activating the `kitchen.vmware.yml` file with the `KITCHEN_LOCAL_YAML`
   # environment variable:
   #
-  #   KITCHEN_LOCAL_YAML=kitchen.vmware.yml kitchen converge chefdk-macosx-109
+  #   KITCHEN_LOCAL_YAML=kitchen.vmware.yml kitchen converge chef-macosx-1011
   #
 
   # OSX
   <% %w(
-    10.9
-    10.10
-    10.11
+    macosx-10.11
+    macos-10.12
+    macos-10.13
   ).each do |mac_version| %>
-  - name: macosx-<%= mac_version %>
+  - name: <%= mac_version %>
     driver:
+      provider: vmware_fusion
+      customize:
+        numvcpus: 4
+        memsize: 4096
       box: chef/macosx-<%= mac_version %> # private
       synced_folders:
       - ['..', '/Users/vagrant/chef']