From 249354bbdaa73f8e6a405164040b26eef7bc2246 Mon Sep 17 00:00:00 2001
From: "Benjamin M. Hughes" <bmhughes@bmhughes.co.uk>
Date: Tue, 9 Jul 2024 09:55:17 +0100
Subject: [PATCH] CI fixup

---
 .github/workflows/ci.yml                          | 15 +++++++++------
 kitchen.dokken.yml                                |  5 -----
 kitchen.global.yml                                |  1 -
 kitchen.yml                                       |  1 -
 resources/installation_package.rb                 |  6 ++++++
 .../inspec/assert_functioning_spec.rb             |  7 +++----
 .../inspec/assert_functioning_spec.rb             |  7 +++----
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d201dd636..9171d7665 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,13 +24,12 @@ jobs:
       matrix:
         os:
           - "almalinux-8"
-          - "centos-7"
-          - "centos-stream-8"
-          - "debian-10"
           - "debian-11"
+          - "debian-12"
           - "rockylinux-8"
-          - "ubuntu-1804"
+          - "rockylinux-9"
           - "ubuntu-2004"
+          - "ubuntu-2204"
         suite:
           - "installation-script-main"
           - "installation-script-test"
@@ -38,10 +37,10 @@ jobs:
           - "installation-tarball"
           - "install-and-stop"
         exclude:
-          - os: debian-9
-            suite: installation-script-main
           - os: debian-11
             suite: installation-script-test
+          - os: debian-12
+            suite: installation-script-test
           - os: almalinux-8
             suite: installation-script-main
           - os: almalinux-8
@@ -50,6 +49,10 @@ jobs:
             suite: installation-script-main
           - os: rockylinux-8
             suite: installation-script-test
+          - os: rockylinux-9
+            suite: installation-script-main
+          - os: rockylinux-9
+            suite: installation-script-test
       fail-fast: false
 
     steps:
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index 1dfe62c8f..6ead9e8e7 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -22,11 +22,6 @@ platforms:
       image: dokken/amazonlinux-2023
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: centos-stream-8
-    driver:
-      image: dokken/centos-stream-8
-      pid_one_command: /usr/lib/systemd/systemd
-
   - name: centos-stream-9
     driver:
       image: dokken/centos-stream-9
diff --git a/kitchen.global.yml b/kitchen.global.yml
index 4396f11eb..1740e4614 100644
--- a/kitchen.global.yml
+++ b/kitchen.global.yml
@@ -18,7 +18,6 @@ platforms:
   - name: almalinux-8
   - name: almalinux-9
   - name: amazonlinux-2023
-  - name: centos-stream-8
   - name: centos-stream-9
   - name: debian-11
   - name: debian-12
diff --git a/kitchen.yml b/kitchen.yml
index fb6728a55..ccf96395b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -20,7 +20,6 @@ platforms:
   - name: almalinux-8
   - name: amazonlinux-2
   - 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
diff --git a/resources/installation_package.rb b/resources/installation_package.rb
index 9cc8b2f65..51ab11955 100644
--- a/resources/installation_package.rb
+++ b/resources/installation_package.rb
@@ -52,6 +52,10 @@ def bullseye?
   false
 end
 
+def bookworm?
+  return true if platform?('debian') && node['platform_version'].to_i == 11
+  false
+end
 def bionic?
   return true if platform?('ubuntu') && node['platform_version'] == '18.04'
   false
@@ -76,6 +80,8 @@ def version_string(v)
                'buster'
              elsif bullseye? # deb 11
                'bullseye'
+             elsif bookworm? # deb 12
+               'bookworm'
              elsif bionic? # ubuntu 18.04
                'bionic'
              elsif focal? # ubuntu 20.04
diff --git a/test/integration/install_and_stop/inspec/assert_functioning_spec.rb b/test/integration/install_and_stop/inspec/assert_functioning_spec.rb
index 0751256a5..f3d0a1ec2 100644
--- a/test/integration/install_and_stop/inspec/assert_functioning_spec.rb
+++ b/test/integration/install_and_stop/inspec/assert_functioning_spec.rb
@@ -1,8 +1,7 @@
-# Debian 9 does not include 23.0
-if os.name == 'debian' && os.release.to_i == 9
+if os.name == 'debian' && os.release.to_i == 11
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/19\.03\./) }
+    its(:stdout) { should match(/27\.0\./) }
   end
 elsif os.name == 'amazon' && %w(2 2023).include?(os.release)
   describe command('/usr/bin/docker --version') do
@@ -12,7 +11,7 @@
 else
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/24\.0\./) }
+    its(:stdout) { should match(/26\.1\./) }
   end
 end
 
diff --git a/test/integration/installation_package/inspec/assert_functioning_spec.rb b/test/integration/installation_package/inspec/assert_functioning_spec.rb
index 82921ec66..89aa5fb83 100644
--- a/test/integration/installation_package/inspec/assert_functioning_spec.rb
+++ b/test/integration/installation_package/inspec/assert_functioning_spec.rb
@@ -1,12 +1,11 @@
-# Debian 9 does not include 20.10
-if os.name == 'debian' && os.release.to_i == 9
+if os.name == 'debian' && os.release.to_i == 11
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/19\.03\./) }
+    its(:stdout) { should match(/27\.0\./) }
   end
 else
   describe command('/usr/bin/docker --version') do
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match(/24\.0\./) }
+    its(:stdout) { should match(/26\.1\./) }
   end
 end