Added back more containers to test on, revised git usage due to Salt git errors, see saltstack/salt#67070

Author: dmurphy18

.github/workflows/ci.yml

@@ -180,6 +180,51 @@ jobs:
 
 
 
+  amazonlinux-2:
+    name: Amazon 2
+    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: amazonlinux-2
+      display-name: Amazon 2
+      container-slug: systemd-amazonlinux-2
+      timeout: 20
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
+
+
+  amazonlinux-2023:
+    name: Amazon 2023
+    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: amazonlinux-2023
+      display-name: Amazon 2023
+      container-slug: systemd-amazonlinux-2023
+      timeout: 20
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
+
+
+  debian-11:
+    name: Debian 11
+    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: debian-11
+      display-name: Debian 11
+      container-slug: systemd-debian-11
+      timeout: 20
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
+
+
   debian-12:
     name: Debian 12
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -192,7 +237,7 @@ jobs:
       display-name: Debian 12
       container-slug: systemd-debian-12
       timeout: 20
-      instances: '["git-3006", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
   photon-5:
@@ -237,7 +282,7 @@ jobs:
       display-name: Rocky Linux 9
       container-slug: systemd-rockylinux-9
       timeout: 20
-      instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
   ubuntu-2204:
@@ -267,6 +312,9 @@ jobs:
       - macos-13
       - macos-14
       - windows-2022
+      - amazonlinux-2
+      - amazonlinux-2023
+      - debian-11
       - debian-12
       - photon-5
       - rockylinux-8

.github/workflows/templates/generate.py

@@ -8,16 +8,16 @@
 
 # only test against current containers with systemd
 # will add these when they become available with systemd
-#    "amazonlinux-2",
-#    "amazonlinux-2023",
-#    "debian-11",
 #    "debian-12",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 LINUX_DISTROS = [
+    "amazonlinux-2",
+    "amazonlinux-2023",
+    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -37,15 +37,15 @@
 
 # only test against current containers with systemd
 # will add these when they become available with systemd
-#    "amazonlinux-2",
-#    "amazonlinux-2023",
-#    "debian-11",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 STABLE_DISTROS = [
+    "amazonlinux-2",
+    "amazonlinux-2023",
+    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -55,15 +55,15 @@
 
 # only test against current containers with systemd
 # will add these when they become available with systemd
-#    "amazonlinux-2",
-#    "amazonlinux-2023",
-#    "debian-11",
 #    "debian-13",
 #    "fedora-40",
 #    "photon-4",
 #    "ubuntu-2004",
 #    "ubuntu-2404",
 ONEDIR_DISTROS = [
+    "amazonlinux-2",
+    "amazonlinux-2023",
+    "debian-11",
     "debian-12",
     "photon-5",
     "rockylinux-8",
@@ -97,31 +97,31 @@
     "photon-5",
 ]
 
-#    "debian-12",
-#    "rockylinux-9",
 #    "ubuntu-2204",
 BLACKLIST_GIT_3006 = [
     "amazonlinux-2",
     "amazonlinux-2023",
     "debian-11",
+    "debian-12",
     "fedora-40",
     "photon-4",
     "photon-5",
+    "rockylinux-9",
     "ubuntu-2004",
     "ubuntu-2404",
 ]
 
-#    "debian-12",
-#    "rockylinux-9",
 #    "ubuntu-2204",
 BLACKLIST_GIT_3007 = [
     "amazonlinux-2",
     "amazonlinux-2023",
     "debian-11",
+    "debian-12",
     "debian-13",
     "fedora-40",
     "photon-4",
     "photon-5",
+    "rockylinux-9",
     "ubuntu-2004",
     "ubuntu-2404",
 ]

bootstrap-salt.sh

@@ -2817,11 +2817,7 @@ EOM
 
     echoinfo "Downloading Salt Dependencies from PyPi"
     echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
-    if [ "${OS_NAME}" = "Linux" ]; then
-        ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r "requirements/static/pkg/py${_py_version}/linux.txt"
-    else
-        ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .
-    fi
+    ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .
     # shellcheck disable=SC2181
     if [ $? -ne 0 ]; then
         echo "Failed to download salt dependencies"