Fix tests

.github/workflows/ci.yml

@@ -9,13 +9,15 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.4
+    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@89865ee56cd1c401b2e758f3b82cafab834ca9f7
     permissions:
       actions: write
       checks: write
       pull-requests: write
       statuses: write
       issues: write
+    with:
+      chef_workstation_version: 22.12.1024 # chef 17
 
   integration:
     needs: lint-unit
@@ -60,6 +62,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
+          CHEF_VERSION: 17
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
         with:
@@ -86,6 +89,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
+          CHEF_VERSION: 17
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
         with:
@@ -118,6 +122,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
+          CHEF_VERSION: 17
           CHEF_LICENSE: accept-no-persist
         with:
           suite: ${{ matrix.suite }}

CHANGELOG.md

@@ -62,7 +62,7 @@ Standardise files with files in sous-chefs/repo-management
 
 ## 10.2.3 - *2022-11-03*
 
-- Update [CHANGELOG.md](/CHANGELOG.md) to fix MarkDownLint rules
+- Update [CHANGELOG.md](CHANGELOG.md) to fix MarkDownLint rules
 
 ## 10.2.2 - *2022-10-10*
 
@@ -104,7 +104,7 @@ Standardise files with files in sous-chefs/repo-management
 
 ## 10.1.2 - *2021-11-16*
 
-- Fix group resource for `docker_installation_tarball` library in #1205 [@benpro](https://github.com/benpro)
+- Fix group resource for `docker_installation_tarball` library in #1205 [@benoitjpnet](https://github.com/benoitjpnet)
 
 ## 10.1.1 - *2021-11-03*
 
@@ -1915,8 +1915,8 @@ Attributes now available for all docker daemon flags as well as system IP forwar
 
 This release deprecates AUFS/device-mapper handling from chef-docker, but provides backwards compatibility by still including the default recipe of the new cookbooks. Please update your dependencies, Github watching/issues, and recipes to reflect the two new community cookbooks:
 
-- aufs: [aufs on community site](http://community.opscode.com/cookbooks/aufs) / [chef-aufs on Github](https://github.com/bflad/chef-aufs)
-- device-mapper: [device-mapper on community site](http://community.opscode.com/cookbooks/device-mapper) / [chef-device-mapper on Github](https://github.com/bflad/chef-device-mapper)
+- aufs: [aufs on community site](https://supermarket.chef.io/cookbooks/aufs) / [chef-aufs on Github](https://github.com/bflad/chef-aufs)
+- device-mapper: [device-mapper on community site](https://supermarket.chef.io/cookbooks/device-mapper) / [chef-device-mapper on Github](https://github.com/bflad/chef-device-mapper)
 - Bugfix: [#109]: Remove on lxc-net start from docker Upstart
 - Enhancement: [#88]: Migrate AUFS logic to separate cookbook
 - Enhancement: [#90]: Migrate device-mapper logic to separate cookbook
@@ -1945,8 +1945,8 @@ This release deprecates AUFS/device-mapper handling from chef-docker, but provid
 
 This release includes Docker 0.9.0 changes and defaults, such as setting exec_driver to libcontainer ("native"), setting -rm on docker build, double dash arguments on the CLI, additional flags, etc.
 
-- DEPRECATED: Rename storage_type attribute to storage_driver to [match Docker terminology](http://docs.docker.io/en/latest/reference/commandline/cli/#daemon) (storage_type will be removed in chef-docker 1.0)
-- DEPRECATED: Rename virtualization_type attribute to exec_driver to [match Docker terminology](http://docs.docker.io/en/latest/reference/commandline/cli/#daemon) (virtualization_type will be removed in chef-docker 1.0)
+- DEPRECATED: Rename storage_type attribute to storage_driver to [match Docker terminology](https://web.archive.org/web/20140611234732/http://docs.docker.com/reference/commandline/cli#daemon) (storage_type will be removed in chef-docker 1.0)
+- DEPRECATED: Rename virtualization_type attribute to exec_driver to [match Docker terminology](https://web.archive.org/web/20140611234732/http://docs.docker.com/reference/commandline/cli#daemon) (virtualization_type will be removed in chef-docker 1.0)
 - Bugfix: [#80]: Use double dashed arguments on CLI
 - Bugfix: Surround String values on CLI with quotes
 - Enhancement: [#77]: Improved docker ps handling
@@ -2086,7 +2086,7 @@ Awesome work by [@jcrobak] to close out two issues ([#49] and [#52]) with [#62].
 - Enhancement: Default to package install_type only on distros with known packages
 - Enhancement: Initial Oracle 6 platform support via binary install_type
 
-   - <https://blogs.oracle.com/wim/entry/oracle_linux_6_5_and>
+   - <https://web.archive.org/web/20160702000726/https://blogs.oracle.com/wim/entry/oracle_linux_6_5_and>
    - <http://www.oracle.com/technetwork/articles/servers-storage-admin/resource-controllers-linux-1506602.html>
 
 - Enhancement: Split out lxc recipe for default platform lxc handling
@@ -2161,7 +2161,7 @@ Awesome work by [@jcrobak] to close out two issues ([#49] and [#52]) with [#62].
 # 0.14.0
 
 - Bugfix: [#27] Only use command to determine running container if provided
-- Bugfix: [#28] Upstart requires full stop and start of service instead of restart if job configuration changes while already running. Note even `initctl reload-configuration` isn't working as expected from <http://upstart.ubuntu.com/faq.html#reload>
+- Bugfix: [#28] Upstart requires full stop and start of service instead of restart if job configuration changes while already running. Note even `initctl reload-configuration` isn't working as expected from <https://manpages.ubuntu.com/manpages/xenial/en/man8/reload.8.html>
 - Enhancement: [#26] Add ability to set package action
 
 # 0.13.0

kitchen.dokken.yml

@@ -28,6 +28,9 @@ platforms:
       pid_one_command: /usr/lib/systemd/systemd
 
   - name: centos-stream-8
+    lifecycle:
+      pre_converge:
+        - remote: dnf makecache
     driver:
       image: dokken/centos-stream-8
       pid_one_command: /usr/lib/systemd/systemd

kitchen.yml

@@ -8,7 +8,7 @@ driver:
 provisioner:
   name: chef_infra
   product_name: <%= ENV['CHEF_PRODUCT_NAME'] || 'chef' %>
-  product_version: 17
+  product_version: <%= ENV['CHEF_VERSION'] || '17' %>
   enforce_idempotency: true
   multiple_converge: 2
   deprecations_as_errors: true
@@ -22,10 +22,18 @@ platforms:
   - name: centos-7
   - name: centos-stream-8
   - name: debian-10
+    # docker post-install script misbehaves on Debian 10 if systemd isn't completely started
+    # https://forums.docker.com/t/failed-to-load-listeners-no-sockets-found-via-socket-activation-make-sure-the-service-was-started-by-systemd/62505/11
+    lifecycle:
+      pre_converge:
+        - remote: 'until systemctl --quiet is-active multi-user.target; do sleep 2; done'
   - name: debian-11
   - name: fedora-latest
   - name: rockylinux-8
   - name: ubuntu-18.04
+    lifecycle:
+      pre_converge:
+        - remote: sudo apt update
   - name: ubuntu-20.04
 
 suites:

test/integration/install_and_stop/inspec/assert_functioning_spec.rb

@@ -4,15 +4,15 @@
     its(:exit_status) { should eq 0 }
     its(:stdout) { should match(/19\.03\./) }
   end
-elsif os.name == 'amazon' && os.release == '2'
+elsif os.name == 'amazon' && %w(2 2023).include?(os.release)
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
     its(:stdout) { should match(/20\.10\./) }
   end
 else
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/23\.0\./) }
+    its(:stdout) { should match(/24\.0\./) }
   end
 end
 

test/integration/installation_package/inspec/assert_functioning_spec.rb

@@ -7,6 +7,6 @@
 else
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/23\.0\./) }
+    its(:stdout) { should match(/24\.0\./) }
   end
 end