From 80f6059d12e9bcafd676496a633f28c4b002a252 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 14 Dec 2022 12:19:14 -0800
Subject: [PATCH 01/29] Adding newer versions of CentOS Stream, AlmaLinux, and
 Rocky Linux

---
 .github/workflows/ci.yml                | 45 +++++++++++++++++++++++++
 .github/workflows/templates/generate.py | 21 ++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd48aba01..9c292ba23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -252,6 +252,20 @@ jobs:
       instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
+  almalinux-9:
+    name: AlmaLinux 9
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-linux.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: almalinux-9
+      display-name: AlmaLinux 9
+      timeout: 20
+      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+
+
   amazon-2:
     name: Amazon 2
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -308,6 +322,20 @@ jobs:
       instances: '["stable-3003", "git-3003", "stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
+  centos-stream9:
+    name: CentOS Stream 9
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-linux.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: centos-stream9
+      display-name: CentOS Stream 9
+      timeout: 20
+      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+
+
   debian-10:
     name: Debian 10
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -490,6 +518,20 @@ jobs:
       instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
+  rockylinux-9:
+    name: Rocky Linux 9
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-linux.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: rockylinux-9
+      display-name: Rocky Linux 9
+      timeout: 20
+      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+
+
   ubuntu-1804:
     name: Ubuntu 18.04
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -549,10 +591,12 @@ jobs:
       - windows-2019
       - windows-2022
       - almalinux-8
+      - almalinux-9
       - amazon-2
       - arch
       - centos-7
       - centos-stream8
+      - centos-stream9
       - debian-10
       - debian-11
       - fedora-35
@@ -566,6 +610,7 @@ jobs:
       - oraclelinux-7
       - oraclelinux-8
       - rockylinux-8
+      - rockylinux-9
       - ubuntu-1804
       - ubuntu-2004
       - ubuntu-2204
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 4f25e3203..0f2f05391 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -9,10 +9,12 @@
 
 LINUX_DISTROS = [
     "almalinux-8",
+    "almalinux-9",
     "amazon-2",
     "arch",
     "centos-7",
     "centos-stream8",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -26,6 +28,7 @@
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
+    "rockylinux-9",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2204",
@@ -72,21 +75,26 @@
 
 ONEDIR_DISTROS = [
     "almalinux-8",
+    "almalinux-9",
     "amazon-2",
     "centos-7",
     "centos-stream8",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
+    "rockylinux-9",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2204",
 ]
 
 BLACKLIST_3003 = [
+    "almalinux-9",
     "arch",
+    "centos-stream9",
     "debian-11",
     "fedora-35",
     "fedora-36",
@@ -97,12 +105,15 @@
     "opensuse-15",
     "opensuse-tumbleweed",
     "rockylinux-8",
+    "rockylinux-9",
     "ubuntu-2204",
 ]
 
 BLACKLIST_GIT_3003 = [
+    "almalinux-9",
     "amazon-2",
     "arch",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -114,13 +125,16 @@
     "opensuse-15",
     "opensuse-tumbleweed",
     "rockylinux-8",
+    "rockylinux-9",
     "ubuntu-2004",
     "ubuntu-2110",
     "ubuntu-2204",
 ]
 
 BLACKLIST_3004 = [
+    "almalinux-9",
     "arch",
+    "centos-stream9",
     "fedora-35",
     "fedora-36",
     "fedora-37",
@@ -129,6 +143,7 @@
     "gentoo-systemd",
     "opensuse-15",
     "opensuse-tumbleweed",
+    "rockylinux-9",
 ]
 
 BLACKLIST_3005 = [
@@ -144,8 +159,10 @@
 ]
 
 BLACKLIST_GIT_3004 = [
+    "almalinux-9",
     "amazon-2",
     "arch",
+    "centos-stream9",
     "debian-10",
     "debian-11",
     "fedora-35",
@@ -159,6 +176,7 @@
     "ubuntu-2004",
     "ubuntu-2110",
     "ubuntu-2204",
+    "rockylinux-9",
 ]
 
 BLACKLIST_GIT_3005 = [
@@ -229,10 +247,12 @@
 
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",
+    "almalinux-9": "AlmaLinux 9",
     "amazon-2": "Amazon 2",
     "arch": "Arch",
     "centos-7": "CentOS 7",
     "centos-stream8": "CentOS Stream 8",
+    "centos-stream9": "CentOS Stream 9",
     "debian-10": "Debian 10",
     "debian-11": "Debian 11",
     "fedora-35": "Fedora 35",
@@ -246,6 +266,7 @@
     "oraclelinux-7": "Oracle Linux 7",
     "oraclelinux-8": "Oracle Linux 8",
     "rockylinux-8": "Rocky Linux 8",
+    "rockylinux-9": "Rocky Linux 9",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2204": "Ubuntu 22.04",

From b9bc07ac0667126024dce88180a9b18ff9a702c9 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Mon, 19 Dec 2022 12:39:55 -0800
Subject: [PATCH 02/29] Adding entries to kitchen.yml

---
 kitchen.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index 1d5a7c039..829a14679 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -29,6 +29,7 @@ provisioner:
     sh -c 't=$(shuf -i 1-15 -n 1); echo Sleeping $t seconds; sleep $t'
 
 platforms:
+  - name: almalinux-9
   - name: almalinux-8
   - name: amazon-2
     driver:
@@ -43,6 +44,9 @@ platforms:
         - pacman -Syu --noconfirm --needed systemd grep awk procps which
         - systemctl enable sshd
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+  - name: centos-stream9
+    driver:
+      image: quay.io/centos/centos:stream8
   - name: centos-stream8
     driver:
       image: quay.io/centos/centos:stream8
@@ -103,6 +107,7 @@ platforms:
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8
+  - name: rockylinux-9
   - name: ubuntu-22.04
     driver:
       run_command: /lib/systemd/systemd

From ffef0b1746ef295432e0e0dbcae2e62cd44888e5 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 08:12:52 -0800
Subject: [PATCH 03/29] Need ssh-rsa for RockyLinux 9.

---
 kitchen.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index 829a14679..76dd785c0 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -108,6 +108,10 @@ platforms:
   - name: oraclelinux-7
   - name: rockylinux-8
   - name: rockylinux-9
+    driver:
+      run_command: /usr/lib/systemd/systemd
+      provision_command:
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-22.04
     driver:
       run_command: /lib/systemd/systemd

From 7cfca56c17053466483e3bab65b4932aa8bab4a6 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 11:56:11 -0800
Subject: [PATCH 04/29] need to install and run update-crypto-policies to allow
 RSA keys to work via SSH on RockLinux and Almalinux.

---
 kitchen.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index 76dd785c0..7a9cc2f4b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -30,6 +30,10 @@ provisioner:
 
 platforms:
   - name: almalinux-9
+      provision_command:
+        - dnf -y install crypto-policies-scripts
+        - update-crypto-policies --set DEFAULT:SHA1
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: almalinux-8
   - name: amazon-2
     driver:
@@ -111,6 +115,8 @@ platforms:
     driver:
       run_command: /usr/lib/systemd/systemd
       provision_command:
+        - dnf -y install crypto-policies-scripts
+        - update-crypto-policies --set DEFAULT:SHA1
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-22.04
     driver:

From 2c4d317b5181fd9d4437c8d54c3b5b8b30a56c7e Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 12:18:10 -0800
Subject: [PATCH 05/29] fixing YAML.

---
 kitchen.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kitchen.yml b/kitchen.yml
index 7a9cc2f4b..e95892b79 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -30,6 +30,7 @@ provisioner:
 
 platforms:
   - name: almalinux-9
+    driver:
       provision_command:
         - dnf -y install crypto-policies-scripts
         - update-crypto-policies --set DEFAULT:SHA1

From aeb74bc8659edff7f1583a8d0539f80608a34e93 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 13:37:41 -0800
Subject: [PATCH 06/29] Need procps-ng on Almalinux 9 and Rockylinux 9

---
 kitchen.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index e95892b79..46f89b7bf 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -32,7 +32,7 @@ platforms:
   - name: almalinux-9
     driver:
       provision_command:
-        - dnf -y install crypto-policies-scripts
+        - dnf -y install crypto-policies-scripts procps-nf
         - update-crypto-policies --set DEFAULT:SHA1
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: almalinux-8
@@ -116,7 +116,7 @@ platforms:
     driver:
       run_command: /usr/lib/systemd/systemd
       provision_command:
-        - dnf -y install crypto-policies-scripts
+        - dnf -y install crypto-policies-scripts procps-ng
         - update-crypto-policies --set DEFAULT:SHA1
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-22.04

From b6328e2b4b2093f5b9b18781bc3f62a794067ad7 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 14:25:58 -0800
Subject: [PATCH 07/29] fixing typo.  procps-ng instead of procps-nf.

---
 kitchen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitchen.yml b/kitchen.yml
index 46f89b7bf..6dd016b10 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -32,7 +32,7 @@ platforms:
   - name: almalinux-9
     driver:
       provision_command:
-        - dnf -y install crypto-policies-scripts procps-nf
+        - dnf -y install crypto-policies-scripts procps-ng
         - update-crypto-policies --set DEFAULT:SHA1
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: almalinux-8

From 7e53753536e290414f5121270e0f6b309bd6be96 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 20 Dec 2022 16:53:09 -0800
Subject: [PATCH 08/29] blacklist almalinux-9, rockylinux-9, and centos-stream9
 for latest.

---
 .github/workflows/ci.yml                | 6 +++---
 .github/workflows/templates/generate.py | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c292ba23..e234f9fda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -263,7 +263,7 @@ jobs:
       distro-slug: almalinux-9
       display-name: AlmaLinux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
 
 
   amazon-2:
@@ -333,7 +333,7 @@ jobs:
       distro-slug: centos-stream9
       display-name: CentOS Stream 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
 
 
   debian-10:
@@ -529,7 +529,7 @@ jobs:
       distro-slug: rockylinux-9
       display-name: Rocky Linux 9
       timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
+      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
 
 
   ubuntu-1804:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 0f2f05391..342002b88 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -243,7 +243,11 @@
     "fedora-38",
 ]
 
-LATEST_PKG_BLACKLIST = []
+LATEST_PKG_BLACKLIST = [
+    "almalinux-9",
+    "centos-stream9",
+    "rockylinux-9",
+]
 
 DISTRO_DISPLAY_NAMES = {
     "almalinux-8": "AlmaLinux 8",

From 4779cc92ff1b739f0f00c96583834e42f7ef88cf Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 21 Dec 2022 09:47:22 -0800
Subject: [PATCH 09/29] when installing git_deps, fall back to onedir_deps if
 stable_deps fails.  will happens if installing on a Red Hat based host, eg.
 CentOS Stream 9, Alma Linux 9, etc, as the classic package repos do not exist
 there.

---
 bootstrap-salt.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 21f847b28..6ba1da8d7 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4617,7 +4617,12 @@ install_centos_stable_post() {
 }
 
 install_centos_git_deps() {
-    install_centos_stable_deps || return 1
+    # First try stable deps then fall back to onedir deps if that one fails
+    # if we're installing on a Red Hat based host that doesn't have the classic
+    # package repos available.
+    install_centos_stable_deps || \
+    install_centos_onedir_deps || \
+    return 1
 
     if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then
         __yum_install_noinput ca-certificates || return 1

From ca683c6ac3cd98ea7c9f3e0b800b4d8a0ec066bb Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 21 Dec 2022 10:40:46 -0800
Subject: [PATCH 10/29] Set ONEDIR_REV incase we end up calling
 install_centos_onedir_deps.

---
 bootstrap-salt.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 6ba1da8d7..bfcdb6e0f 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4620,6 +4620,9 @@ install_centos_git_deps() {
     # First try stable deps then fall back to onedir deps if that one fails
     # if we're installing on a Red Hat based host that doesn't have the classic
     # package repos available.
+    # Set ONEDIR_REV to STABLE_REV in case we
+    # end up calling install_centos_onedir_deps
+    ONEDIR_REV=${STABLE_REV}
     install_centos_stable_deps || \
     install_centos_onedir_deps || \
     return 1

From 0280cde59ad29690b2dc8c6758b7d0c0c6746a67 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Tue, 31 Jan 2023 14:24:23 -0800
Subject: [PATCH 11/29] bump the version of koalaman/shellcheck-alpine up

---
 .github/workflows/ci.yml           | 2 +-
 .github/workflows/templates/ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e234f9fda..34af654b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,7 +93,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    container: koalaman/shellcheck-alpine:v0.6.0
+    container: koalaman/shellcheck-alpine:v0.7.0
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
index 96d3bb618..113c8ee9e 100644
--- a/.github/workflows/templates/ci.yml
+++ b/.github/workflows/templates/ci.yml
@@ -93,7 +93,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    container: koalaman/shellcheck-alpine:v0.6.0
+    container: koalaman/shellcheck-alpine:v0.7.0
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v3

From 4eabf0aeb6b5bea2884cbfab64af4ec00acc8b90 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 1 Feb 2023 18:52:13 -0800
Subject: [PATCH 12/29] account for different paths for the systemd service
 files in later versions.

---
 bootstrap-salt.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d942c9055..c46b12d72 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4791,10 +4791,16 @@ install_centos_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_FILE="${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service"
+        else
+          _SERVICE_FILE="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service"
+        fi
         if [ -f /bin/systemctl ]; then
             if [ ! -f "/usr/lib/systemd/system/salt-${fname}.service" ] || \
                 { [ -f "/usr/lib/systemd/system/salt-${fname}.service" ] && [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; }; then
-                __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" /usr/lib/systemd/system
+                __copyfile "${_SERVICE_FILE}" /usr/lib/systemd/system
             fi
 
             SYSTEMD_RELOAD=$BS_TRUE

From aea71469ec3d15d26be6b3bfe9c4b034a357ecc8 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 08:51:12 -0800
Subject: [PATCH 13/29] Account for new location for systemd and upstart files
 on Debian and Ubuntu.

---
 bootstrap-salt.sh | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c46b12d72..ab21352ee 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3402,8 +3402,15 @@ install_ubuntu_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+        else
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg"
+        fi
+
         if [ -f /bin/systemctl ] && [ "$DISTRO_MAJOR_VERSION" -ge 16 ]; then
-            __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
+            __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
             # Skip salt-api since the service should be opt-in and not necessarily started on boot
             [ $fname = "api" ] && continue
@@ -3418,8 +3425,8 @@ install_ubuntu_git_post() {
             if [ ! -f $_upstart_conf ]; then
                 # upstart does not know about our service, let's copy the proper file
                 echowarn "Upstart does not appear to know about salt-$fname"
-                echodebug "Copying ${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-$fname.upstart to $_upstart_conf"
-                __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.upstart" "$_upstart_conf"
+                echodebug "Copying ${_SERVICE_DIR}/salt-$fname.upstart to $_upstart_conf"
+                __copyfile "${_SERVICE_DIR}/salt-${fname}.upstart" "$_upstart_conf"
                 # Set service to know about virtualenv
                 if [ "${_VIRTUALENV_DIR}" != "null" ]; then
                     echo "SALT_USE_VIRTUALENV=${_VIRTUALENV_DIR}" > /etc/default/salt-${fname}
@@ -4014,16 +4021,23 @@ install_debian_git_post() {
         [ "$fname" = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ "$fname" = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+        else
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg"
+        fi
+
         # Configure SystemD for Debian 8 "Jessie" and later
         if [ -f /bin/systemctl ]; then
             if [ ! -f /lib/systemd/system/salt-${fname}.service ] || \
                 { [ -f /lib/systemd/system/salt-${fname}.service ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]; }; then
-                if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" ]; then
-                    __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" /lib/systemd/system
-                    __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.environment" "/etc/default/salt-${fname}"
+                if [ -f "${_SERVICE_DIR}/salt-${fname}.service" ]; then
+                    __copyfile "${_SERVICE_DIR}/salt-${fname}.service" /lib/systemd/system
+                    __copyfile "${_SERVICE_DIR}/salt-${fname}.environment" "/etc/default/salt-${fname}"
                 else
                     # workaround before adding Debian-specific unit files to the Salt main repo
-                    __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" /lib/systemd/system
+                    __copyfile "${_SERVICE_DIR}/salt-${fname}.service" /lib/systemd/system
                     sed -i -e '/^Type/ s/notify/simple/' /lib/systemd/system/salt-${fname}.service
                 fi
             fi

From 84604ae7f97188ca7f1f4d880662b79a944b61b0 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 10:12:59 -0800
Subject: [PATCH 14/29] Account for new location for systemd files on Fedora.

---
 bootstrap-salt.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index ab21352ee..cc88f7a7d 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4337,7 +4337,13 @@ install_fedora_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
-        __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+        else
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm"
+        fi
+        __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
         # Salt executables are located under `/usr/local/bin/` on Fedora 36+
         #if [ "${DISTRO_VERSION}" -ge 36 ]; then

From 59da03a73c0c457e773fe2f63efbadd5253d47a8 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 10:20:50 -0800
Subject: [PATCH 15/29] Account for new location for systemd files on OpenSUSE.

---
 bootstrap-salt.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index cc88f7a7d..bcc968015 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -7380,10 +7380,17 @@ install_opensuse_git_post() {
                 use_usr_lib=$BS_TRUE
             fi
 
+            # Account for new path for services files in later releases
+            if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+              _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+            else
+              _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/"
+            fi
+
             if [ "${use_usr_lib}" -eq $BS_TRUE ]; then
-                __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/usr/lib/systemd/system/salt-${fname}.service"
+                __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/usr/lib/systemd/system/salt-${fname}.service"
             else
-                __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
+                __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
             fi
 
             continue

From 465ec9a8e9c18adc57790ccab026b0bd534670d7 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 10:24:12 -0800
Subject: [PATCH 16/29] Account for new location for systemd files on Arch.

---
 bootstrap-salt.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index bcc968015..d782ecc1f 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6556,8 +6556,15 @@ install_arch_linux_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+        else
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm"
+        fi
+
         if [ -f /usr/bin/systemctl ]; then
-            __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
+            __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
             # Skip salt-api since the service should be opt-in and not necessarily started on boot
             [ $fname = "api" ] && continue

From db46fb94e422ab3e98195721ad8c2c83eccec03d Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 10:28:31 -0800
Subject: [PATCH 17/29] Account for new location for systemd files on Gentoo.

---
 bootstrap-salt.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d782ecc1f..34267efc8 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -8099,8 +8099,15 @@ install_gentoo_git_post() {
         [ $fname = "minion" ] && [ "$_INSTALL_MINION" -eq $BS_FALSE ] && continue
         [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
 
+        # Account for new path for services files in later releases
+        if [ -f "${_SALT_GIT_CHECKOUT_DIR}/pkg/common/salt-${fname}.service" ]; then
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg/common"
+        else
+          _SERVICE_DIR="${_SALT_GIT_CHECKOUT_DIR}/pkg"
+        fi
+
         if __check_command_exists systemctl ; then
-            __copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
+            __copyfile "${_SERVICE_DIR}/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
 
             # Skip salt-api since the service should be opt-in and not necessarily started on boot
             [ $fname = "api" ] && continue

From 4358274986d81d685934bcaaf536eaf7a72a53ec Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 2 Feb 2023 13:59:20 -0800
Subject: [PATCH 18/29] Update install_ubuntu_git and install_debian_git to
 account for different locations for the systemd service files.

---
 bootstrap-salt.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 34267efc8..02195a6f9 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3330,7 +3330,15 @@ install_ubuntu_git() {
         _POST_NEON_PIP_INSTALL_ARGS=""
         __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
         cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
-        sed -i 's:/usr/bin:/usr/local/bin:g' pkg/*.service
+
+        # Account for new path for services files in later releases
+        if [ -d "pkg/common" ]; then
+          _SERVICE_DIR="pkg/common"
+        else
+          _SERVICE_DIR="pkg"
+        fi
+
+        sed -i 's:/usr/bin:/usr/local/bin:g' ${_SERVICE_DIR}/*.service
         return 0
     fi
 
@@ -3962,7 +3970,15 @@ install_debian_git() {
         _POST_NEON_PIP_INSTALL_ARGS=""
         __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
         cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1
-        sed -i 's:/usr/bin:/usr/local/bin:g' pkg/*.service
+
+        # Account for new path for services files in later releases
+        if [ -d "pkg/common" ]; then
+          _SERVICE_DIR="pkg/common"
+        else
+          _SERVICE_DIR="pkg"
+        fi
+
+        sed -i 's:/usr/bin:/usr/local/bin:g' ${_SERVICE_DIR}/*.service
         return 0
     fi
 

From 78b9d765e96a8a56e2fd1f4b0c85f9f5be162022 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 10:25:51 -0800
Subject: [PATCH 19/29] Need to add --use-517 when installing dependencies from
 PIP when building on Arch and Gentoo.

---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 02195a6f9..b050dc52d 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2832,11 +2832,11 @@ EOM
     mkdir /tmp/git/deps
     echoinfo "Downloading Salt Dependencies from PyPi"
     echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'"
-    ${_pip_cmd} download -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1)
+    ${_pip_cmd} download --use-517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1)
 
     echoinfo "Installing Downloaded Salt Dependencies"
     echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
-    ${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
+    ${_pip_cmd} install --use-517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
     rm -f /tmp/git/deps/*
 
     echoinfo "Building Salt Python Wheel"

From af44e88261e39bf37ec1d6ebecb4bbabd41359cf Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 10:55:41 -0800
Subject: [PATCH 20/29] fixing typo.  --use-pep517 instead of --use-517

---
 bootstrap-salt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b050dc52d..f03162d38 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2832,11 +2832,11 @@ EOM
     mkdir /tmp/git/deps
     echoinfo "Downloading Salt Dependencies from PyPi"
     echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'"
-    ${_pip_cmd} download --use-517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1)
+    ${_pip_cmd} download --use-pep517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1)
 
     echoinfo "Installing Downloaded Salt Dependencies"
     echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
-    ${_pip_cmd} install --use-517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
+    ${_pip_cmd} install --use-pep517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
     rm -f /tmp/git/deps/*
 
     echoinfo "Building Salt Python Wheel"

From 4d74e818e449285f53c79ae5d19eb9c47049ec65 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 14:56:32 -0800
Subject: [PATCH 21/29] only use --use-pep517 with Arch.

---
 bootstrap-salt.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index f03162d38..c0ff3ca4a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2832,11 +2832,11 @@ EOM
     mkdir /tmp/git/deps
     echoinfo "Downloading Salt Dependencies from PyPi"
     echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'"
-    ${_pip_cmd} download --use-pep517 -d /tmp/git/deps . || (echo "Failed to download salt dependencies" && return 1)
+    ${_pip_cmd} download -d /tmp/git/deps ${_POST_NEON_PIP_INSTALL_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
 
     echoinfo "Installing Downloaded Salt Dependencies"
     echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
-    ${_pip_cmd} install --use-pep517 --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
+    ${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
     rm -f /tmp/git/deps/*
 
     echoinfo "Building Salt Python Wheel"
@@ -6515,6 +6515,7 @@ install_arch_linux_stable() {
 
 install_arch_linux_git() {
 
+    _POST_NEON_PIP_INSTALL_ARGS="${_POST_NEON_PIP_INSTALL_ARGS} --use-pep517"
     if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
          __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
         return 0

From 1fc0b89e3e6bffa18e508c7d9ffb7909260bd891 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 16:39:35 -0800
Subject: [PATCH 22/29] Swapping ${_POST_NEON_PIP_INSTALL_ARGS} for
 ${_PIP_DOWNLOAD_ARGS}

---
 bootstrap-salt.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index c0ff3ca4a..d2c87af30 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -277,6 +277,7 @@ _POST_NEON_INSTALL=$BS_FALSE
 _MINIMUM_PIP_VERSION="9.0.1"
 _MINIMUM_SETUPTOOLS_VERSION="9.1"
 _POST_NEON_PIP_INSTALL_ARGS="--prefix=/usr"
+_PIP_DOWNLOAD_ARGS=""
 
 # Defaults for install arguments
 ITYPE="stable"
@@ -2831,8 +2832,8 @@ EOM
 
     mkdir /tmp/git/deps
     echoinfo "Downloading Salt Dependencies from PyPi"
-    echodebug "Running '${_pip_cmd} download -d /tmp/git/deps .'"
-    ${_pip_cmd} download -d /tmp/git/deps ${_POST_NEON_PIP_INSTALL_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
+    echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
+    ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . || (echo "Failed to download salt dependencies" && return 1)
 
     echoinfo "Installing Downloaded Salt Dependencies"
     echodebug "Running '${_pip_cmd} install --ignore-installed ${_POST_NEON_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
@@ -6516,6 +6517,7 @@ install_arch_linux_stable() {
 install_arch_linux_git() {
 
     _POST_NEON_PIP_INSTALL_ARGS="${_POST_NEON_PIP_INSTALL_ARGS} --use-pep517"
+    _PIP_DOWNLOAD_ARGS="${_PIP_DOWNLOAD_ARGS} --use-pep517"
     if [ "${_POST_NEON_INSTALL}" -eq $BS_TRUE ]; then
          __install_salt_from_repo_post_neon "${_PY_EXE}" || return 1
         return 0

From e301b91ad415274bdda316020a96c5f592f71ffc Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 18:27:12 -0800
Subject: [PATCH 23/29] Adding to install_gentoo_git_deps to update setuptools
 to fix bootstrap install with git master.

---
 bootstrap-salt.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d2c87af30..d1c6d5b04 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -8036,6 +8036,8 @@ install_gentoo_git_deps() {
         __emerge ${GENTOO_GIT_PACKAGES} || return 1
     fi
 
+    __emerge -v1 setuptools || return 1
+
     __git_clone_and_checkout || return 1
     __gentoo_post_dep || return 1
 }

From 123bae77b19ddf75b20483ba532f3913fa0d9657 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Fri, 3 Feb 2023 18:56:22 -0800
Subject: [PATCH 24/29] Adding some logging to be able to find the command.

---
 bootstrap-salt.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index d1c6d5b04..1c144d1a3 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -8036,6 +8036,7 @@ install_gentoo_git_deps() {
         __emerge ${GENTOO_GIT_PACKAGES} || return 1
     fi
 
+    echoinfo "Running emerge -v1 setuptools"
     __emerge -v1 setuptools || return 1
 
     __git_clone_and_checkout || return 1

From b1f5203f506cae28e60fac44dca295c5b041fa56 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 8 Feb 2023 12:25:36 -0800
Subject: [PATCH 25/29] Removing rockylinux:9 until PR into kitchen-docker has
 been merged.

---
 .github/workflows/ci.yml                | 15 ---------------
 .github/workflows/templates/generate.py |  8 --------
 kitchen.yml                             |  1 -
 3 files changed, 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34af654b0..f9818dcb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -518,20 +518,6 @@ jobs:
       instances: '["stable-3004", "git-3004", "stable-3005", "git-3005", "onedir-3005", "git-master", "latest", "onedir-nightly"]'
 
 
-  rockylinux-9:
-    name: Rocky Linux 9
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: rockylinux-9
-      display-name: Rocky Linux 9
-      timeout: 20
-      instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly"]'
-
-
   ubuntu-1804:
     name: Ubuntu 18.04
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -610,7 +596,6 @@ jobs:
       - oraclelinux-7
       - oraclelinux-8
       - rockylinux-8
-      - rockylinux-9
       - ubuntu-1804
       - ubuntu-2004
       - ubuntu-2204
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 342002b88..487729273 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -28,7 +28,6 @@
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
-    "rockylinux-9",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2204",
@@ -85,7 +84,6 @@
     "oraclelinux-7",
     "oraclelinux-8",
     "rockylinux-8",
-    "rockylinux-9",
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2204",
@@ -105,7 +103,6 @@
     "opensuse-15",
     "opensuse-tumbleweed",
     "rockylinux-8",
-    "rockylinux-9",
     "ubuntu-2204",
 ]
 
@@ -125,7 +122,6 @@
     "opensuse-15",
     "opensuse-tumbleweed",
     "rockylinux-8",
-    "rockylinux-9",
     "ubuntu-2004",
     "ubuntu-2110",
     "ubuntu-2204",
@@ -143,7 +139,6 @@
     "gentoo-systemd",
     "opensuse-15",
     "opensuse-tumbleweed",
-    "rockylinux-9",
 ]
 
 BLACKLIST_3005 = [
@@ -176,7 +171,6 @@
     "ubuntu-2004",
     "ubuntu-2110",
     "ubuntu-2204",
-    "rockylinux-9",
 ]
 
 BLACKLIST_GIT_3005 = [
@@ -246,7 +240,6 @@
 LATEST_PKG_BLACKLIST = [
     "almalinux-9",
     "centos-stream9",
-    "rockylinux-9",
 ]
 
 DISTRO_DISPLAY_NAMES = {
@@ -270,7 +263,6 @@
     "oraclelinux-7": "Oracle Linux 7",
     "oraclelinux-8": "Oracle Linux 8",
     "rockylinux-8": "Rocky Linux 8",
-    "rockylinux-9": "Rocky Linux 9",
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2204": "Ubuntu 22.04",
diff --git a/kitchen.yml b/kitchen.yml
index 6dd016b10..6e1ebe9f8 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -112,7 +112,6 @@ platforms:
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8
-  - name: rockylinux-9
     driver:
       run_command: /usr/lib/systemd/systemd
       provision_command:

From 3b9439856dab5ce0e54dd3757e95701a7d019609 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 8 Feb 2023 15:38:36 -0800
Subject: [PATCH 26/29] removing update-crypto-policies --set DEFAULT:SHA1, no
 longer needed for rockylinux:8

---
 kitchen.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 6e1ebe9f8..401e7b1be 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -109,14 +109,13 @@ platforms:
         - *opensuse_provision_command_02
         - *opensuse_provision_command_03
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+  - name: rockylinux-8
   - name: oraclelinux-8
   - name: oraclelinux-7
-  - name: rockylinux-8
     driver:
       run_command: /usr/lib/systemd/systemd
       provision_command:
         - dnf -y install crypto-policies-scripts procps-ng
-        - update-crypto-policies --set DEFAULT:SHA1
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-22.04
     driver:

From eeeaddd21d25f44e394882e1374c604be61417dd Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Wed, 8 Feb 2023 16:26:21 -0800
Subject: [PATCH 27/29] removing bits not needed for rockylinux:8,
 oraclelinux:8, or oraclelinux:9

---
 kitchen.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 401e7b1be..9504d895b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -109,14 +109,9 @@ platforms:
         - *opensuse_provision_command_02
         - *opensuse_provision_command_03
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
-  - name: rockylinux-8
   - name: oraclelinux-8
   - name: oraclelinux-7
-    driver:
-      run_command: /usr/lib/systemd/systemd
-      provision_command:
-        - dnf -y install crypto-policies-scripts procps-ng
-        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
+  - name: rockylinux-8
   - name: ubuntu-22.04
     driver:
       run_command: /lib/systemd/systemd

From e5981993ca2fe23031b1f05cbaee27516d28682d Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 9 Feb 2023 11:24:36 -0800
Subject: [PATCH 28/29] fixing centos:stream9 docker URL

---
 kitchen.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kitchen.yml b/kitchen.yml
index 9504d895b..33a64ea70 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -51,7 +51,11 @@ platforms:
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: centos-stream9
     driver:
-      image: quay.io/centos/centos:stream8
+      image: quay.io/centos/centos:stream9
+      provision_command:
+        - dnf -y install crypto-policies-scripts procps-ng
+        - update-crypto-policies --set DEFAULT:SHA1
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: centos-stream8
     driver:
       image: quay.io/centos/centos:stream8

From 35e360189ac1df8d7013d54dea4548619c3c5951 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Thu, 9 Feb 2023 12:12:50 -0800
Subject: [PATCH 29/29] Adding platform: centosstraem to centosstream:9

---
 kitchen.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kitchen.yml b/kitchen.yml
index 33a64ea70..7cd0f6063 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -51,6 +51,7 @@ platforms:
         - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: centos-stream9
     driver:
+      platform: centosstream
       image: quay.io/centos/centos:stream9
       provision_command:
         - dnf -y install crypto-policies-scripts procps-ng