Merge pull request #231 from opscode/schisamo/omnibus-4.0

Upgrade to Omnibus 4.0

.gitignore

@@ -4,6 +4,7 @@ vendor/bundle
 pkg/*
 .vagrant
 .kitchen
+.kitchen.local.yml
 bin/*
 files/chef-server-cookbooks/cache/
 files/msi/ChefClient-Config.wxi

.kitchen.local.yml.vmware.example

@@ -0,0 +1,6 @@
+driver:
+  name: vagrant
+  provider: vmware_fusion
+  customize:
+    numvcpus: 2
+    memsize: 2048

.kitchen.yml

@@ -1,18 +1,23 @@
-# NOTE: this runs the omnibus cookbook, but doens't mount filesystems or
-# run omnibus yet.  Use 'kichen converge' to setup the virt and install
-# omnibus cookbooks and then be able to login to it
+#
+# NOTE: this runs the omnibus cookbook, but does not actually run Omnibus. Use
+# 'kichen converge' to setup the virtual machine and then `kitchen login` to
+# SSH into the machine and run Omnibus.
+#
 
 driver:
   name: vagrant
+  forward_agent: yes
   customize:
-    memory: 2048
     cpus: 4
+    memory: 4096
   synced_folders:
-    - ['.', '/home/vagrant/omnibus-chef', type: 'rsync']
+    - ['.', '/home/vagrant/omnibus-chef']
+    - ['../omnibus', '/home/vagrant/omnibus']
+    - ['../omnibus-software', '/home/vagrant/omnibus-software']
 
 provisioner:
   name: chef_zero
-  require_chef_omnibus: true
+  require_chef_omnibus: 11.12.4
 
 platforms:
   - name: centos-5.10
@@ -39,25 +44,60 @@ platforms:
     run_list: apt::default
   - name: ubuntu-14.04
     run_list: apt::default
+  # The following boxes are shared via VagrantCloud. Until kitchen-vagrant
+  # is updated you'll need to add the box manually:
+  #
+  #   vagrant box add chef/windows-8.1-professional
+  #
+  # Please note this may require a `vagrant login` if the box is private.
+  #
+  # The following 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`.
+  #
+  - name: macosx-10.8
+    driver:
+      box: chef/macosx-10.8 # private
+  - name: macosx-10.9
+    driver:
+      box: chef/macosx-10.9 # private
+  - name: windows-7-professional
+    provisioner:
+      name: windows_chef_zero
+    driver:
+      box: chef/windows-7-professional # private
+  - name: windows-8.1-professional
+    provisioner:
+      name: windows_chef_zero
+    driver:
+      box: chef/windows-8.1-professional # private
+  - name: windows-2008r2-standard
+    provisioner:
+      name: windows_chef_zero
+    driver:
+      box: chef/windows-server-2008r2-standard # private
 
 suites:
   - name: chef
+    run_list: omnibus::default
     attributes:
       omnibus:
-        build_user: vagrant
+        build_user:  vagrant
+        build_dir:   /home/vagrant/chef
         install_dir: /opt/chef
-    run_list: omnibus::default
   - name: chefdk
+    run_list: omnibus::default
     attributes:
       omnibus:
-        build_user: vagrant
+        build_user:  vagrant
+        build_dir:   /home/vagrant/chefdk
         install_dir: /opt/chefdk
-    run_list: omnibus::default
   - name: chef-container
-    attributes:
-      omnibus:
-        build_user: vagrant
-        install_dir: /opt/chef
     run_list:
       - omnibus::default
       - docker::default
+    attributes:
+      omnibus:
+        build_user:  vagrant
+        build_dir:   /home/vagrant/chef-container
+        install_dir: /opt/chef-container

Berksfile

@@ -4,7 +4,7 @@ cookbook 'omnibus'
 cookbook 'docker', github: 'tduffield/chef-docker'
 
 # Uncomment to use the latest version of the Omnibus cookbook from GitHub
-#cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
+# cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
 
 group :integration do
   cookbook 'apt',      '~> 2.3'

Berksfile.lock

@@ -15,7 +15,7 @@ GRAPH
     apt (>= 0.0.0)
     modules (>= 0.0.0)
   build-essential (2.0.4)
-  chef-sugar (2.0.0)
+  chef-sugar (2.2.0)
   chef_handler (1.1.6)
   device-mapper (0.1.0)
     apt (>= 0.0.0)
@@ -50,7 +50,7 @@ GRAPH
     dpkg_autostart (~> 0.1.10)
   modules (0.2.0)
   ohai (2.0.1)
-  omnibus (2.2.0)
+  omnibus (2.3.0)
     7-zip (~> 1.0)
     build-essential (~> 2.0)
     chef-sugar (~> 2.0)

Gemfile

@@ -1,7 +1,18 @@
 source 'https://rubygems.org'
 
-gem 'omnibus-software', :github => 'opscode/omnibus-software',
-  :branch => 'omnibus/3.2-stable'
+gem 'omnibus-software', github: 'opscode/omnibus-software'
+gem 'omnibus', github: 'opscode/omnibus'
 
-gem 'omnibus', :github => 'opscode/omnibus-ruby',
-  :branch => '3.0-stable'
+# This development group is installed by default when you run `bundle install`,
+# but if you are using Omnibus in a CI-based infrastructure, you do not need
+# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
+# by running `bundle install --without development` to speed up build times.
+group :development do
+  # Use Berkshelf for resolving cookbook dependencies
+  gem 'berkshelf', '~> 3.0'
+
+  # Use Test Kitchen with Vagrant for converging the build environment
+  gem 'test-kitchen',      '~> 1.2'
+  gem 'kitchen-vagrant',   '~> 0.15'
+  gem 'windows_chef_zero', '~> 2.0'
+end

Gemfile.lock

@@ -1,62 +1,92 @@
 GIT
-  remote: git://github.com/opscode/omnibus-ruby.git
-  revision: fba19a79516f4decdcebeaf10dfe4739c44fa39c
-  branch: 3.0-stable
+  remote: git://github.com/opscode/omnibus.git
+  revision: e1dd9cde1d21f2aae06a4cdef98e36c852f8d143
   specs:
-    omnibus (3.2.1)
-      chef-sugar (~> 1.2)
-      fpm (~> 0.4)
+    omnibus (4.0.0.beta.1)
+      chef-sugar (~> 2.2)
+      cleanroom (~> 1.0)
       mixlib-shellout (~> 1.4)
       ohai (~> 7.2)
       thor (~> 0.18)
       uber-s3
 
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: 21aa33b43750d13e462a8f4f360699e588d448ba
-  branch: omnibus/3.2-stable
+  revision: 17482b914f4ee182e5ce95a9e978bd7d4b143906
   specs:
-    omnibus-software (3.0.0)
+    omnibus-software (4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
-    arr-pm (0.0.9)
-      cabin (> 0)
-    backports (3.6.0)
-    cabin (0.6.1)
-    chef-sugar (1.3.0)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.3)
+    berkshelf (3.1.5)
+      addressable (~> 2.3.4)
+      berkshelf-api-client (~> 1.2)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      faraday (~> 0.9.0)
+      minitar (~> 0.5.4)
+      octokit (~> 3.0)
+      retryable (~> 1.3.3)
+      ridley (~> 4.0)
+      solve (~> 1.1)
+      thor (~> 0.18)
+    berkshelf-api-client (1.2.0)
+      faraday (~> 0.9.0)
+    buff-config (1.0.1)
+      buff-extensions (~> 1.0)
+      varia_model (~> 0.4)
+    buff-extensions (1.0.0)
+    buff-ignore (1.1.1)
+    buff-ruby_engine (0.1.0)
+    buff-shell_out (0.2.0)
+      buff-ruby_engine (~> 0.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.0)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.0.0)
+    chef-sugar (2.2.0)
+    cleanroom (1.0.0)
+    dep-selector-libgecode (1.0.2)
+    dep_selector (1.0.3)
+      dep-selector-libgecode (~> 1.0)
+      ffi (~> 1.9)
+    erubis (2.7.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
-    ffi-yajl (1.0.2)
+    ffi-yajl (1.1.0)
       ffi (~> 1.5)
       libyajl2 (~> 1.0)
-    fpm (0.4.42)
-      arr-pm (~> 0.0.8)
-      backports (>= 2.6.2)
-      cabin (>= 0.6.0)
-      childprocess
-      clamp (~> 0.6)
-      ftw (~> 0.0.30)
-      json (>= 1.7.7)
-    ftw (0.0.39)
-      addressable
-      backports (>= 2.6.2)
-      cabin (> 0)
-      http_parser.rb (= 0.5.3)
-    http_parser.rb (0.5.3)
+    hashie (2.1.2)
+    hitimes (1.2.2)
     ipaddress (0.8.0)
     json (1.8.1)
+    kitchen-vagrant (0.15.0)
+      test-kitchen (~> 1.0)
     libyajl2 (1.0.1)
     mime-types (1.25.1)
+    minitar (0.5.4)
+    mixlib-authentication (1.3.0)
+      mixlib-log
     mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (1.4.0)
-    ohai (7.2.4)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    nio4r (1.0.1)
+    octokit (3.3.1)
+      sawyer (~> 0.5.3)
+    ohai (7.4.0)
       ffi (~> 1.9)
       ffi-yajl (~> 1.0)
       ipaddress
@@ -67,15 +97,58 @@ GEM
       mixlib-shellout (~> 1.2)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    retryable (1.3.6)
+    ridley (4.0.0)
+      addressable
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
+      buff-ignore (~> 1.1)
+      buff-shell_out (~> 0.1)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      erubis
+      faraday (~> 0.9.0)
+      hashie (>= 2.0.2, < 3.0.0)
+      json (>= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      net-http-persistent (>= 2.8)
+      retryable
+      semverse (~> 1.1)
+      varia_model (~> 0.4)
+    safe_yaml (1.0.3)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.2.1)
+    solve (1.2.1)
+      dep_selector (~> 1.0)
+      semverse (~> 1.1)
     systemu (2.6.4)
+    test-kitchen (1.2.1)
+      mixlib-shellout (~> 1.2)
+      net-scp (~> 1.1)
+      net-ssh (~> 2.7)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
     thor (0.19.1)
+    timers (4.0.0)
+      hitimes
     uber-s3 (0.2.4)
       mime-types (~> 1.17)
+    varia_model (0.4.0)
+      buff-extensions (~> 1.0)
+      hashie (>= 2.0.2, < 3.0.0)
+    windows_chef_zero (2.0.0)
+      test-kitchen (>= 1.2.1)
     wmi-lite (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  berkshelf (~> 3.0)
+  kitchen-vagrant (~> 0.15)
   omnibus!
   omnibus-software!
+  test-kitchen (~> 1.2)
+  windows_chef_zero (~> 2.0)