Merge pull request #4856 from chef/schisamo/fix-omnibus-build-lab

Fix Omnibus Build Lab 

4 files changed, 40 insertions, 65 deletions

diff --git a/omnibus/.kitchen.local.yml.vmware.example b/omnibus/.kitchen.vmware.yml
index 69f001ef97..69f001ef97 100644
--- a/omnibus/.kitchen.local.yml.vmware.example
+++ b/omnibus/.kitchen.vmware.yml
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index e64cadca26..90283f8afb 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -11,7 +11,9 @@ driver:
     cpus: 4
     memory: 4096
   synced_folders:
-    - ['../..', '/home/vagrant']
+    - ['..', '/home/vagrant/chef']
+    - ['../../omnibus', '/home/vagrant/omnibus']
+    - ['../../omnibus-software', '/home/vagrant/omnibus-software']
 
 provisioner:
   name: chef_zero
@@ -55,27 +57,39 @@ platforms:
   #
   # Chef-internal users, you will need to:
   # 1.  Create an Atlas account:  https://atlas.hashicorp.com/
-  # 2.  Ping the Release Services room with your Atlas account name
+  # 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.
   #
   # The Mac OS X boxes are VMware only also. You can enable VMware Fusion
-  # as the default provider by copying `.kitchen.local.yml.vmware.example`
-  # over to `.kitchen.local.yml`.
+  # by activating the `.kitchen.vmware.yml` file with the `KITCHEN_LOCAL_YAML`
+  # environment variable:
   #
-  - name: macosx-10.9
-    driver:
-      box: chef/macosx-10.9 # private
-  - name: macosx-10.10
-    driver:
-      box: chef/macosx-10.10 # private
-  - name: macosx-10.11
+  #   KITCHEN_LOCAL_YAML=.kitchen.vmware.yml kitchen converge chefdk-macosx-109
+  #
+  <% %w(
+    10.9
+    10.10
+    10.11
+  ).each do |mac_version| %>
+  - name: macosx-<%= mac_version %>
     driver:
-      box: chef/macosx-10.11 # private
+      box: chef/macosx-<%= mac_version %> # private
+      synced_folders:
+      - ['..', '/Users/vagrant/chef']
+      - ['../../omnibus', '/Users/vagrant/omnibus']
+      - ['../../omnibus-software', '/Users/vagrant/omnibus-software']
+  <% end %>
   - name: windows-2012r2-standard
     driver:
       box: chef/windows-server-2012r2-standard # private
+      synced_folders:
+      # We have to mount this repos enclosing folder as the Omnibus build
+      # gets cranky if the mounted Chef source folder is a symlink. This
+      # mounts at `C:\vagrant\code` and the Chef source folder is available
+      # at `C:\vagrant\code\chef`
+      - ['../..', '/vagrant/code']
     provisioner:
       chef_omnibus_root: /opscode/angrychef
 
@@ -96,6 +110,6 @@ suites:
     attributes:
       omnibus:
         <<: *attribute_defaults
-        install_dir: /opscode/chef
+        install_dir: /opt/chef
     run_list:
       - omnibus::default
diff --git a/omnibus/Berksfile.lock b/omnibus/Berksfile.lock
deleted file mode 100644
index 93ed1a1f46..0000000000
--- a/omnibus/Berksfile.lock
+++ /dev/null
@@ -1,47 +0,0 @@
-DEPENDENCIES
-  apt (~> 2.3)
-  freebsd (~> 0.1)
-  omnibus
-  yum-epel (~> 0.3)
-
-GRAPH
-  apt (2.9.2)
-  build-essential (3.2.0)
-    seven_zip (>= 0.0.0)
-  chef-sugar (3.3.0)
-  chef_handler (1.3.0)
-  dmg (2.3.0)
-  freebsd (0.6.0)
-  git (4.4.1)
-    build-essential (>= 0.0.0)
-    dmg (>= 0.0.0)
-    windows (>= 0.0.0)
-    yum-epel (>= 0.0.0)
-  homebrew (2.1.0)
-    build-essential (>= 2.1.2)
-  languages (0.2.6)
-    build-essential (>= 0.0.0)
-    chef-sugar (>= 0.0.0)
-    homebrew (>= 0.0.0)
-    remote_install (>= 0.0.0)
-  omnibus (3.3.0)
-    build-essential (>= 3.0.0)
-    chef-sugar (>= 3.2.0)
-    git (>= 0.0.0)
-    homebrew (>= 0.0.0)
-    languages (>= 0.0.0)
-    remote_install (>= 0.0.0)
-    windows (>= 0.0.0)
-    windows-sdk (>= 0.0.0)
-    wix (>= 0.0.0)
-  remote_install (1.0.2)
-  seven_zip (2.0.0)
-    windows (>= 1.2.2)
-  windows (1.39.2)
-    chef_handler (>= 0.0.0)
-  windows-sdk (1.0.2)
-  wix (2.0.2)
-    windows (>= 1.38.2)
-  yum (3.10.0)
-  yum-epel (0.6.6)
-    yum (~> 3.10.0)
diff --git a/omnibus/README.md b/omnibus/README.md
index 24aa0e61fa..98a9094325 100644
--- a/omnibus/README.md
+++ b/omnibus/README.md
@@ -88,7 +88,7 @@ liking, you can bring up an individual build environment using the `kitchen`
 command.
 
 ```shell
-$ bundle exec kitchen converge <PROJECT>-ubuntu-1204
+$ bundle exec kitchen converge chef-ubuntu-1404
 ```
 
 Then login to the instance and build the project as described in the Usage
@@ -101,6 +101,14 @@ $ bundle exec kitchen login <PROJECT>-ubuntu-1204
 [vagrant@ubuntu...] $ ...
 [vagrant@ubuntu...] $ bundle exec omnibus build <PROJECT> -l internal
 ```
+```shell
+$ kitchen login chef-ubuntu-1404
+[vagrant@ubuntu...] $ source load-omnibus-toolchain.sh
+[vagrant@ubuntu...] $ cd chef/omnibus
+[vagrant@ubuntu...] $ bundle install --without development # Don't install dev tools!
+[vagrant@ubuntu...] $ ...
+[vagrant@ubuntu...] $ bundle exec omnibus build chef -l internal
+```
 
 You can also login to Windows instances but will have to manually call the
 `load-omnibus-toolchain.bat` script which initializes the build environment.
@@ -113,13 +121,13 @@ Last login: Sat Sep 13 10:19:04 2014 from 172.16.27.1
 Microsoft Windows [Version 6.3.9600]
 (c) 2013 Microsoft Corporation. All rights reserved.
 
-C:\Users\vagrant>load-omnibus-toolchain.bat
+C:\>C:\vagrant\load-omnibus-toolchain.bat
 
-C:\Users\vagrant>cd C:\home\vagrant\chef\omnibus
+C:\>cd C:\vagrant\code\chef\omnibus
 
-C:\home\vagrant\chef\omnibus>bundle install --without development
+C:\vagrant\code\chef\omnibus>bundle install --without development
 
-C:\home\vagrant\chef\omnibus>bundle exec omnibus build <PROJECT> -l internal
+C:\vagrant\code\chef\omnibus>bundle exec omnibus build chef -l internal
 ```
 
 For a complete list of all commands and platforms, run `kitchen list` or