Limited the containers tested on, and skip git testing till Salt requ…

…irements fixed
saltstack · Nov 26, 2024 · 13e00e0 · 13e00e0
1 parent ba0a5f2
commit 13e00e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 60 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -180,51 +180,6 @@ 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'
@@ -237,7 +192,7 @@ jobs:
       display-name: Debian 12
       container-slug: systemd-debian-12
       timeout: 20
-      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
   photon-5:
@@ -282,7 +237,7 @@ jobs:
       display-name: Rocky Linux 9
       container-slug: systemd-rockylinux-9
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-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", "latest", "default"]'
 
 
   ubuntu-2204:
@@ -312,9 +267,6 @@ jobs:
       - macos-13
       - macos-14
       - windows-2022
-      - amazonlinux-2
-      - amazonlinux-2023
-      - debian-11
       - debian-12
       - photon-5
       - rockylinux-8

diff --git a/.github/workflows/templates/generate.py b/.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",
@@ -126,15 +126,16 @@
     "ubuntu-2404",
 ]
 
-##    "rockylinux-9",
 BLACKLIST_GIT_MASTER = [
     "amazonlinux-2",
     "amazonlinux-2023",
     "debian-11",
+    "debian-12",
     "debian-13",
     "fedora-40",
     "photon-4",
     "photon-5",
+    "rockylinux-9",
 ]
 
 SALT_VERSIONS = [