Merge remote-tracking branch 'origin/main' into jesseprieur/BS-141

10 files changed, 25 insertions, 24 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3113ed020a..d559cf71ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
 
-<!-- latest_release 18.1.7 -->
-## [v18.1.7](https://github.com/chef/chef/tree/v18.1.7) (2023-01-25)
+<!-- latest_release 18.1.8 -->
+## [v18.1.8](https://github.com/chef/chef/tree/v18.1.8) (2023-01-27)
 
 #### Merged Pull Requests
-- revert chef-foundation changes in chef omnibus config [#13528](https://github.com/chef/chef/pull/13528) ([evanahlberg](https://github.com/evanahlberg))
+- Change to github commit sha. [#13507](https://github.com/chef/chef/pull/13507) ([gcs-devel](https://github.com/gcs-devel))
 <!-- latest_release -->
 
 <!-- release_rollup since=18.1.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Change to github commit sha. [#13507](https://github.com/chef/chef/pull/13507) ([gcs-devel](https://github.com/gcs-devel)) <!-- 18.1.8 -->
 - revert chef-foundation changes in chef omnibus config [#13528](https://github.com/chef/chef/pull/13528) ([evanahlberg](https://github.com/evanahlberg)) <!-- 18.1.7 -->
 - Example of bash resource doubled escape characters [#13509](https://github.com/chef/chef/pull/13509) ([sean-horn](https://github.com/sean-horn)) <!-- 18.1.6 -->
 - Update expired certificate used in kitchen tests [#13527](https://github.com/chef/chef/pull/13527) ([neha-p6](https://github.com/neha-p6)) <!-- 18.1.5 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b80a67412..9341a953c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,12 +50,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.1.7)
+    chef (18.1.8)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.1.7)
-      chef-utils (= 18.1.7)
+      chef-config (= 18.1.8)
+      chef-utils (= 18.1.8)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -84,13 +84,13 @@ PATH
       unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.1.7-x64-mingw-ucrt)
+    chef (18.1.8-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.1.7)
+      chef-config (= 18.1.8)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.1.7)
+      chef-utils (= 18.1.8)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -134,15 +134,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.1.7)
-      chef (= 18.1.7)
+    chef-bin (18.1.8)
+      chef (= 18.1.8)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.1.7)
+    chef-config (18.1.8)
       addressable
-      chef-utils (= 18.1.7)
+      chef-utils (= 18.1.8)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -151,7 +151,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.1.7)
+    chef-utils (18.1.8)
       concurrent-ruby
 
 GEM
diff --git a/VERSION b/VERSION
index ca6b021f03..525a448131 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.7
\ No newline at end of file
+18.1.8
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 6fff6c303f..a3fb58f0bb 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.1.7".freeze
+  VERSION = "18.1.8".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2cd7bd932a..7ff16deed9 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.1.7".freeze
+  VERSION = "18.1.8".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 51bc5dcfa3..c67554f256 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.1.7"
+  VERSION = "18.1.8"
 end
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 1c9fba97d6..58c98b72e2 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -24,13 +24,13 @@ lifecycle:
     - remote: /opt/chef/bin/ohai -v
     - remote: echo "Installing appbundler and appbundle-updater gems:"
     - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
-    - remote: scl enable devtoolset-7 '/opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT']  || %x(git rev-parse HEAD).chomp %> --tarball --github <%= ENV['GITHUB_REPOSITORY']  || "chef/chef" %>'
+    - remote: scl enable devtoolset-7 '/opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['GITHUB_SHA']  || %x(git rev-parse HEAD).chomp %> --tarball --github <%= ENV['GITHUB_REPOSITORY']  || "chef/chef" %>'
       includes:
         - centos-6
         - centos-7
         - oraclelinux-7
     - remote: echo "Updating Chef using appbundler-updater:"
-    - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT']  || %x(git rev-parse HEAD).chomp %> --tarball --github <%= ENV['GITHUB_REPOSITORY']  || "chef/chef" %>
+    - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['GITHUB_SHA']  || %x(git rev-parse HEAD).chomp %> --tarball --github <%= ENV['GITHUB_REPOSITORY']  || "chef/chef" %>
       excludes:
         - centos-6
         - centos-7
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index b358d72925..fab86fec24 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    chef (18.1.7)
-    chef (18.1.7-x64-mingw-ucrt)
+    chef (18.1.8)
+    chef (18.1.8-x64-mingw-ucrt)
 
 PLATFORMS
   ruby
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index a5bae22c13..bd2bdb653f 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.1.7".freeze
+    VERSION = "18.1.8".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 034eb50854..2361dbe498 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.1.7")
+  VERSION = Chef::VersionString.new("18.1.8")
 end
 
 #