From 2af19c5fb8fe8aa878e3075ec9c3b84b0eee452e Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Wed, 1 Aug 2018 11:21:56 -0600 Subject: [PATCH] [SHACK-304] Temporarily pinning Chef to master To take advantage of https://github.com/chef/chef/pull/7515 and fix the build pipeline Signed-off-by: tyler-ball --- Gemfile | 2 +- Gemfile.lock | 173 ++++++++++++++++++++++++++------------------------- 2 files changed, 90 insertions(+), 85 deletions(-) diff --git a/Gemfile b/Gemfile index 54816be18..d45a87115 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ group(:omnibus_package) do gem "chef-provisioning-aws", ">= 3.0.2", group: :provisioning gem "chef-provisioning-fog", ">= 0.26.1", group: :provisioning gem "chef-vault", ">= 3.3.0" - gem "chef", "= 14.3.37" + gem "chef", :git => "https://github.com/chef/chef.git" gem "cheffish", ">= 14.0.1" gem "chefspec", ">= 7.2.0" gem "fauxhai", ">= 5.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index b289ddba4..614acabfd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,71 +1,11 @@ -PATH - remote: . +GIT + remote: https://github.com/chef/chef.git + revision: 14f53b252cfc4a4aef3375d854b2b2965357f5f0 specs: - chef-dk (3.1.8) - addressable (>= 2.3.5, < 2.6) - chef (~> 14.0) - chef-provisioning (~> 2.0) - cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.0) - ffi-yajl (>= 1.0, < 3.0) - minitar (~> 0.6) - mixlib-cli (~> 1.7) - mixlib-shellout (~> 2.0) - paint (~> 1.0) - solve (> 2.0, < 5.0) - -GEM - remote: https://rubygems.org/ - specs: - activesupport (5.2.0) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - app_conf (0.4.2) - appbundler (0.11.6) - mixlib-cli (~> 1.4) - mixlib-shellout (~> 2.0) - artifactory (2.8.2) - ast (2.4.0) - aws-sdk (2.11.96) - aws-sdk-resources (= 2.11.96) - aws-sdk-core (2.11.96) - aws-sigv4 (~> 1.0) - jmespath (~> 1.0) - aws-sdk-resources (2.11.96) - aws-sdk-core (= 2.11.96) - aws-sigv4 (1.0.3) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure_mgmt_resources (0.16.0) - ms_rest_azure (~> 0.10.0) - backports (3.11.3) - berkshelf (7.0.4) - chef (>= 13.6.52) - chef-config - cleanroom (~> 1.0) - concurrent-ruby (~> 1.0) - minitar (>= 0.6) - mixlib-archive (~> 0.4) - mixlib-config (>= 2.2.5) - mixlib-shellout (~> 2.0) - octokit (~> 4.0) - retryable (~> 2.0) - solve (~> 4.0) - thor (>= 0.20) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - builder (3.2.3) - byebug (10.0.2) - chef (14.3.37) + chef (14.4.20) addressable bundler (>= 1.10) - chef-config (= 14.3.37) + chef-config (= 14.4.20) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -73,7 +13,7 @@ GEM ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.9.1) + iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -93,10 +33,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.3.37-universal-mingw32) + chef (14.4.20-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.3.37) + chef-config (= 14.4.20) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -104,7 +44,7 @@ GEM ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) iniparse (~> 1.4) - iso8601 (~> 0.9.1) + iso8601 (~> 0.11.0) mixlib-archive (~> 0.4) mixlib-authentication (~> 2.1) mixlib-cli (~> 1.7) @@ -135,6 +75,77 @@ GEM win32-taskscheduler (~> 1.0.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) + chef-config (14.4.20) + addressable + fuzzyurl + mixlib-config (>= 2.2.12, < 3.0) + mixlib-shellout (~> 2.0) + tomlrb (~> 1.2) + +PATH + remote: . + specs: + chef-dk (3.1.8) + addressable (>= 2.3.5, < 2.6) + chef (~> 14.0) + chef-provisioning (~> 2.0) + cookbook-omnifetch (~> 0.5) + diff-lcs (~> 1.0) + ffi-yajl (>= 1.0, < 3.0) + minitar (~> 0.6) + mixlib-cli (~> 1.7) + mixlib-shellout (~> 2.0) + paint (~> 1.0) + solve (> 2.0, < 5.0) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + app_conf (0.4.2) + appbundler (0.11.6) + mixlib-cli (~> 1.4) + mixlib-shellout (~> 2.0) + artifactory (2.8.2) + ast (2.4.0) + aws-sdk (2.11.98) + aws-sdk-resources (= 2.11.98) + aws-sdk-core (2.11.98) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.11.98) + aws-sdk-core (= 2.11.98) + aws-sigv4 (1.0.3) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + azure_mgmt_resources (0.17.0) + ms_rest_azure (~> 0.11.0) + backports (3.11.3) + berkshelf (7.0.4) + chef (>= 13.6.52) + chef-config + cleanroom (~> 1.0) + concurrent-ruby (~> 1.0) + minitar (>= 0.6) + mixlib-archive (~> 0.4) + mixlib-config (>= 2.2.5) + mixlib-shellout (~> 2.0) + octokit (~> 4.0) + retryable (~> 2.0) + solve (~> 4.0) + thor (>= 0.20) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (10.0.2) chef-api (0.8.0) logify (~> 0.1) mime-types @@ -151,12 +162,6 @@ GEM toml-rb train tty-spinner - chef-config (14.3.37) - addressable - fuzzyurl - mixlib-config (>= 2.2.12, < 3.0) - mixlib-shellout (~> 2.0) - tomlrb (~> 1.2) chef-provisioning (2.7.1) cheffish (>= 4.0, < 15.0) inifile (>= 2.0.2) @@ -309,7 +314,7 @@ GEM fog-core (~> 1.45.0) fog-json (>= 1.0) ipaddress (>= 0.8) - fog-rackspace (0.1.5) + fog-rackspace (0.1.6) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -454,9 +459,9 @@ GEM googleauth (~> 0.6.2) grpc (>= 1.7.2, < 2.0) rly (~> 0.2.3) - google-protobuf (3.6.0) - google-protobuf (3.6.0-x64-mingw32) - google-protobuf (3.6.0-x86-mingw32) + google-protobuf (3.6.1) + google-protobuf (3.6.1-x64-mingw32) + google-protobuf (3.6.1-x86-mingw32) googleapis-common-protos (1.3.7) google-protobuf (~> 3.0) googleapis-common-protos-types (~> 1.0) @@ -535,7 +540,7 @@ GEM tomlrb (~> 1.2) train (~> 1.4, >= 1.4.15) ipaddress (0.8.3) - iso8601 (0.9.1) + iso8601 (0.11.0) jmespath (1.4.0) json (2.1.0) jwt (2.1.0) @@ -637,7 +642,7 @@ GEM concurrent-ruby (~> 1.0) faraday (~> 0.9) timeliness (~> 0.3) - ms_rest_azure (0.10.8) + ms_rest_azure (0.11.0) concurrent-ruby (~> 1.0) faraday (~> 0.9) faraday-cookie_jar (~> 0.0.6) @@ -806,7 +811,7 @@ GEM structured_warnings (0.3.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (1.22.0) + test-kitchen (1.23.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -897,7 +902,7 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.2.0) + winrm-fs (1.2.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) @@ -916,7 +921,7 @@ DEPENDENCIES artifactory berkshelf (>= 7.0) bundler - chef (= 14.3.37) + chef! chef-apply chef-dk! chef-provisioning (>= 2.7.1)