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

10 files changed, 58 insertions, 23 deletions

diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 589d572be4..2a715c8f95 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -186,7 +186,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - 'amazonlinux-2'
           - 'centos-6'
           - 'centos-7'
           - 'almalinux-8'
@@ -224,3 +223,38 @@ jobs:
           cd /home/runner/work/chef/chef/kitchen-tests
           bundle install
           bundle exec kitchen test end-to-end-${{ matrix.os }}
+  # Amazon Linux 2 has an issue with systemctl (throws a timedatectl error)
+  # if dokken container hosted on Ubuntu 22.04 or later. Lock to Ubuntu 20.04
+  # for now.
+  linux-2004-host:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - 'amazonlinux-2'
+        ruby: ['3.1']
+    runs-on: ubuntu-20.04
+    env:
+      FORCE_FFI_YAJL: ext
+      CHEF_LICENSE: accept-no-persist
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+          bundler-cache: false
+          working-directory: kitchen-tests
+      - name: Run Test Kitchen
+        working-directory: kitchen-tests
+        run:  |
+          ruby -v
+          echo "Which ruby are we using?"
+          which ruby
+          cd /home/runner/work/chef/chef
+          bundle install
+          gem install kitchen
+          cd /home/runner/work/chef/chef/kitchen-tests
+          bundle install
+          bundle exec kitchen test end-to-end-${{ matrix.os }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d559cf71ee..9b3c81b780 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.8 -->
-## [v18.1.8](https://github.com/chef/chef/tree/v18.1.8) (2023-01-27)
+<!-- latest_release 18.1.9 -->
+## [v18.1.9](https://github.com/chef/chef/tree/v18.1.9) (2023-01-27)
 
 #### Merged Pull Requests
-- Change to github commit sha. [#13507](https://github.com/chef/chef/pull/13507) ([gcs-devel](https://github.com/gcs-devel))
+- Run Amazon Linux 2 kitchen tests on ubuntu-20.04 [#13531](https://github.com/chef/chef/pull/13531) ([tpowell-progress](https://github.com/tpowell-progress))
 <!-- latest_release -->
 
 <!-- release_rollup since=18.1.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Run Amazon Linux 2 kitchen tests on ubuntu-20.04 [#13531](https://github.com/chef/chef/pull/13531) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 18.1.9 -->
 - 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9341a953c7..f65c763b62 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,12 +50,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.1.8)
+    chef (18.1.9)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.1.8)
-      chef-utils (= 18.1.8)
+      chef-config (= 18.1.9)
+      chef-utils (= 18.1.9)
       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.8-x64-mingw-ucrt)
+    chef (18.1.9-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.1.8)
+      chef-config (= 18.1.9)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.1.8)
+      chef-utils (= 18.1.9)
       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.8)
-      chef (= 18.1.8)
+    chef-bin (18.1.9)
+      chef (= 18.1.9)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.1.8)
+    chef-config (18.1.9)
       addressable
-      chef-utils (= 18.1.8)
+      chef-utils (= 18.1.9)
       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.8)
+    chef-utils (18.1.9)
       concurrent-ruby
 
 GEM
diff --git a/VERSION b/VERSION
index 525a448131..3bd23cb314 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.1.8
\ No newline at end of file
+18.1.9
\ 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 a3fb58f0bb..d96a25e8af 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.8".freeze
+  VERSION = "18.1.9".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7ff16deed9..56569d3afe 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.8".freeze
+  VERSION = "18.1.9".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index c67554f256..1e524d0227 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.8"
+  VERSION = "18.1.9"
 end
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index fab86fec24..6c4e50dae5 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: ..
   specs:
-    chef (18.1.8)
-    chef (18.1.8-x64-mingw-ucrt)
+    chef (18.1.9)
+    chef (18.1.9-x64-mingw-ucrt)
 
 PLATFORMS
   ruby
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index bd2bdb653f..d5187217f9 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.8".freeze
+    VERSION = "18.1.9".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2361dbe498..b5dfc643c5 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.8")
+  VERSION = Chef::VersionString.new("18.1.9")
 end
 
 #