diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | omnibus/.kitchen.yml | 33 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 37 |
3 files changed, 41 insertions, 32 deletions
@@ -20,8 +20,9 @@ gem "cheffish" group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "nokogiri" + gem "nokogiri", "= 1.6.7.2" end + group(:omnibus_package, :pry) do gem "pry" gem "pry-byebug" diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml index 90283f8afb..ed060a8ef8 100644 --- a/omnibus/.kitchen.yml +++ b/omnibus/.kitchen.yml @@ -24,6 +24,10 @@ provisioner: attributes: vagrant: this_key_exists_so_we_have_a_vagrant_key: true + omnibus: + build_user: vagrant + build_user_group: vagrant + build_user_password: vagrant chef_omnibus_install_options: -P angrychef chef_omnibus_root: /opt/angrychef @@ -91,12 +95,30 @@ platforms: # at `C:\vagrant\code\chef` - ['../..', '/vagrant/code'] provisioner: + attributes: + omnibus: + build_user: vagrant + build_user_group: Administrators + build_user_password: vagrant + chef_omnibus_root: /opscode/angrychef + # By adding an `i386` to the name the Omnibus cookbook's `load-omnibus-toolchain.bat` + # will load the 32-bit version of the MinGW toolchain. + - name: windows-2012r2-standard-i386 + 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 ChefDK source folder is a symlink. This + # mounts at `C:\vagrant\code` and the ChefDK source folder is available + # at `C:\vagrant\code\chef-dk` + - ['../..', '/vagrant/code'] + provisioner: + attributes: + omnibus: + build_user: vagrant + build_user_group: Administrators + build_user_password: vagrant chef_omnibus_root: /opscode/angrychef - -attribute_defaults: &attribute_defaults - build_user: vagrant - build_user_group: vagrant - build_user_password: vagrant suites: # - name: angrychef @@ -109,7 +131,6 @@ suites: - name: chef attributes: omnibus: - <<: *attribute_defaults install_dir: /opt/chef run_list: - omnibus::default diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f165fa5d12..6e6223b3b5 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,13 +1,13 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 2f04eff7dbec575cb2985d846dacd02a422cd36f + revision: 01a01a482af325d52c7491c124cc6c67d2dd4637 specs: omnibus-software (4.0.0) omnibus (>= 5.2.0) GIT remote: https://github.com/chef/omnibus.git - revision: a36e70caedceadfcf0d85e2adef44ba0218a60a6 + revision: 2a597277f1a5e13901d116ef852611fe88f6b76b specs: omnibus (5.4.0) aws-sdk (~> 2) @@ -37,13 +37,13 @@ GEM specs: addressable (2.3.8) artifactory (2.3.2) - awesome_print (1.6.1) - aws-sdk (2.3.9) - aws-sdk-resources (= 2.3.9) - aws-sdk-core (2.3.9) + awesome_print (1.7.0) + aws-sdk (2.3.13) + aws-sdk-resources (= 2.3.13) + aws-sdk-core (2.3.13) jmespath (~> 1.0) - aws-sdk-resources (2.3.9) - aws-sdk-core (= 2.3.9) + aws-sdk-resources (2.3.13) + aws-sdk-core (= 2.3.13) berkshelf (3.3.0) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -75,13 +75,13 @@ GEM buff-shell_out (0.2.0) buff-ruby_engine (~> 0.1.0) builder (3.2.2) - byebug (9.0.4) + byebug (9.0.5) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.10.24) + chef-config (12.11.18) fuzzyurl (~> 0.8.0) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) @@ -93,7 +93,6 @@ GEM dep_selector (1.0.3) dep-selector-libgecode (~> 1.0) ffi (~> 1.9) - diff-lcs (1.2.5) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -125,14 +124,11 @@ GEM multi_json (~> 1.10) method_source (0.8.2) minitar (0.5.4) - mixlib-authentication (1.4.0) + mixlib-authentication (1.4.1) mixlib-log - rspec-core (~> 3.2) - rspec-expectations (~> 3.2) - rspec-mocks (~> 3.2) mixlib-cli (1.6.0) mixlib-config (2.2.1) - mixlib-install (1.0.12) + mixlib-install (1.0.13) artifactory mixlib-shellout mixlib-versioning @@ -194,15 +190,6 @@ GEM retryable (~> 2.0) semverse (~> 1.1) varia_model (~> 0.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) ruby-progressbar (1.8.1) rubyntlm (0.6.0) rubyzip (1.2.0) |