Bring in libgecode-dep-selector changes

omnibus/.gitignore

@@ -1,8 +1,9 @@
+Berksfile.lock
+bin/
 .bundle
 vendor/bundle
-pkg/*
+pkg/
 .kitchen.local.yml
-bin/*
 files/chef-server-cookbooks/cache/
 files/msi/ChefClient-Config.wxi
 cookbooks

omnibus/.kitchen.yml

@@ -18,6 +18,8 @@ driver:
 provisioner:
   name: chef_zero
   require_chef_omnibus: true # Always install the latest version of Chef
+  attributes:
+    vagrant: true
 
 platforms:
   - name: centos-5.10
@@ -52,13 +54,13 @@ platforms:
     run_list: apt::default
   # The following (private) boxes are shared via Atlas and are only
   # available to users working for Chef. Sorry, it's about software licensing.
-  # 
-  # Chef-internal users, you will need to:  
+  #
+  # 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
   #     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 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`
@@ -82,6 +84,9 @@ platforms:
   - name: windows-2008r2-standard
     driver:
       box: chef/windows-server-2008r2-standard # private
+  - name: windows-2012r2-standard
+    driver:
+      box: chef/windows-server-2012r2-standard # private
 
 attribute_defaults: &attribute_defaults
   build_user:          vagrant

omnibus/Berksfile

@@ -1,6 +1,6 @@
 source 'https://supermarket.chef.io'
 
-cookbook 'omnibus'
+cookbook 'omnibus', path: '../../cookbooks/omnibus'
 
 # Uncomment to use the latest version of the Omnibus cookbook from GitHub
 # cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'

omnibus/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'omnibus', git: 'https://github.com/chef/omnibus.git'
-gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git'
+gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git', branch: 'jk/compiled-ruby'
 
 # pedump pessimistically pins multipart-post to a version from 2013 which makes
 # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
@@ -13,10 +13,10 @@ gem 'pedump', git: 'https://github.com/ksubrama/pedump.git', branch: 'patch-1'
 # by running `bundle install --without development` to speed up build times.
 group :development do
   # Use Berkshelf for resolving cookbook dependencies
-  gem 'berkshelf', '~> 3.0'
+  gem 'berkshelf'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',    '~> 1.6'
-  gem 'kitchen-vagrant', '~> 0.19.0'
-  gem 'winrm-fs', '~> 0.3'
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'winrm-fs'
 end

omnibus/config/projects/chefdk.rb

@@ -44,6 +44,7 @@
 override :'kitchen-inspec', version: "v0.12.3"
 
 override :berkshelf,        version: "v4.3.0"
+override :'dep-selector-libgecode', version: "jk/compiled-ruby"
 
 override :'test-kitchen',   version: "v1.6.0"