Merge pull request #6757 from chef/tm/branch_14

start Chef Client 14

10 files changed, 55 insertions, 65 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 2487aa5bab..8a856ee5ba 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -34,6 +34,8 @@ github:
   # for building.
   release_branch:
     - master:
+        version_constraint: 14.*
+    - chef-13:
         version_constraint: 13.*
     - chef-12:
         version_constraint: 12.*
diff --git a/.travis.yml b/.travis.yml
index 2b3b582694..80695c09e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ before_script:
 branches:
   only:
   - master
+  - chef-13
   - chef-12
 
 env:
@@ -31,12 +32,6 @@ env:
 matrix:
   include:
   - env:
-      INTEGRATION_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       INTEGRATION_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -49,12 +44,6 @@ matrix:
     script: sudo -E $(which bundle) exec rake spec:integration;
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
-      FUNCTIONAL_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       FUNCTIONAL_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -67,14 +56,6 @@ matrix:
     script: sudo -E $(which bundle) exec rake spec:functional;
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
-      UNIT_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script:
-      - sudo -E $(which bundle) exec rake spec:unit;
-      - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       UNIT_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -92,13 +73,13 @@ matrix:
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.4.3
+    rvm: 2.5.0
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.4.3
+    rvm: 2.5.0
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
@@ -108,40 +89,40 @@ matrix:
   - env:
       TEST_GEM: sethvargo/chef-sugar
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       PEDANT_OPTS: --skip-oc_id
       TEST_GEM: chef/chef-zero
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec cheffs
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/cheffish
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chefspec/chefspec
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: foodcritic/foodcritic
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake test
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: poise/halite
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: poise/poise
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   ### START TEST KITCHEN ONLY ###
   #
   - rvm: 2.4.3
@@ -349,7 +330,7 @@ matrix:
 #      - AWESOME_CUSTOMERS_RHEL=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
 #    ### END TEST KITCHEN ONLY ###
-  - rvm: 2.4.3
+  - rvm: 2.5.0
     sudo: required
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
@@ -373,6 +354,3 @@ notifications:
   on_failure: true
   on_success: change
   on_pull_requests: false
-  irc:
-    channels:
-    - chat.freenode.net#chef-hacking
diff --git a/Gemfile b/Gemfile
index 14b67daf94..7a5a26bbbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,8 @@ source "https://rubygems.org"
 # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
 gem "chef", path: "."
 
-gem "ohai", "~> 13"
+# @todo before shipping 14.0 we need to switch this over to a gem again
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
 
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 gem "cheffish", "~> 13" # required for rspec tests
diff --git a/Gemfile.lock b/Gemfile.lock
index 17ff1eb48a..25d2806da0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,24 @@ GIT
       rubocop (= 0.49.1)
 
 GIT
+  remote: https://github.com/chef/ohai.git
+  revision: a83abef381b615ce175bfe81bd8498fa3b1a4acf
+  branch: master
+  specs:
+    ohai (14.0.0)
+      chef-config (>= 12.5.0.alpha.1, < 15)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log (>= 1.7.1, < 2.0)
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+
+GIT
   remote: https://github.com/rubysec/bundler-audit.git
   revision: b84d88f76c4d656421c1d810c9760b0fdea5d13a
   specs:
@@ -17,10 +35,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (13.7.16)
+    chef (14.0.0)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.7.16)
+      chef-config (= 14.0.0)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -36,7 +54,7 @@ PATH
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 14.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       rspec-core (~> 3.5)
@@ -47,10 +65,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.7.16-universal-mingw32)
+    chef (14.0.0-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.7.16)
+      chef-config (= 14.0.0)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -67,7 +85,7 @@ PATH
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 14.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       rspec-core (~> 3.5)
@@ -92,7 +110,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (13.7.16)
+    chef-config (14.0.0)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -107,7 +125,7 @@ GEM
       mixlib-cli (~> 1.4)
     ast (2.3.0)
     backports (3.11.0)
-    binding_of_caller (0.7.3)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (9.1.0)
@@ -134,7 +152,7 @@ GEM
     ethon (0.11.0)
       ffi (>= 1.3.0)
     excon (0.60.0)
-    faraday (0.13.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -163,7 +181,7 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec (1.49.2)
+    inspec (1.50.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -222,18 +240,6 @@ GEM
     nori (2.6.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.7.1)
-      chef-config (>= 12.5.0.alpha.1, < 14)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
-      ipaddress
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
-      mixlib-shellout (~> 2.0)
-      plist (~> 3.1)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
@@ -340,7 +346,7 @@ GEM
       ethon (>= 0.8.0)
     unicode-display_width (1.3.0)
     uuidtools (2.1.5)
-    webmock (3.2.1)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -374,7 +380,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.1.1)
+    winrm-fs (1.2.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -398,7 +404,7 @@ DEPENDENCIES
   inspec
   netrc
   octokit
-  ohai (~> 13)
+  ohai!
   pry
   pry-byebug
   pry-remote
diff --git a/VERSION b/VERSION
index 2ad6de81a4..4b964e9654 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.16
\ No newline at end of file
+14.0.0
diff --git a/appveyor.yml b/appveyor.yml
index aa9fb93902..30af2ea6d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,6 +18,7 @@ skip_tags: true
 branches:
   only:
     - master
+    - chef-13
     - chef-12
 
 install:
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0c7625ae92..ee732c12d4 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "13.7.16"
+  VERSION = "14.0.0"
 end
 
 #
diff --git a/chef.gemspec b/chef.gemspec
index eb187df38f..9dd85d74c6 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-authentication", "~> 1.4"
   s.add_dependency "mixlib-shellout", "~> 2.0"
   s.add_dependency "mixlib-archive", "~> 0.4"
-  s.add_dependency "ohai", "~> 13.0"
+  s.add_dependency "ohai", "~> 14.0"
 
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 2.9", "< 5.0"
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 144363b4ae..9cc63fb7d6 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gem "rake" # required to build some native extensions
 gem "chef", path: ".."
+# remove this ohai pin once we ship the 14 gem
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
 gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
 gem "kitchen-appbundle-updater", git: "https://github.com/chef/kitchen-appbundle-updater", branch: "master"
 gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9bfe3554ef..a1ec6e9e7a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("13.7.16")
+  VERSION = Chef::VersionString.new("14.0.0")
 end
 
 #