Re-add the removed Linux OS'es for the package download tests

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
s0undt3ch · Jan 2, 2024 · 7967cf9 · 7967cf9
1 parent 1fc6fb1
commit 7967cf9
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 9 deletions.
diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml
@@ -68,9 +68,15 @@ jobs:
           - distro-slug: almalinux-8
             arch: x86_64
             pkg-type: package
+          - distro-slug: almalinux-8-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: almalinux-9
             arch: x86_64
             pkg-type: package
+          - distro-slug: almalinux-9-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: amazonlinux-2
             arch: x86_64
             pkg-type: package
@@ -86,15 +92,27 @@ jobs:
           - distro-slug: centos-7
             arch: x86_64
             pkg-type: package
+          - distro-slug: centos-7-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: centosstream-8
             arch: x86_64
             pkg-type: package
+          - distro-slug: centosstream-8-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: centosstream-9
             arch: x86_64
             pkg-type: package
+          - distro-slug: centosstream-9-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: debian-10
             arch: x86_64
             pkg-type: package
+          - distro-slug: debian-10-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: debian-11
             arch: x86_64
             pkg-type: package
@@ -110,9 +128,15 @@ jobs:
           - distro-slug: fedora-37
             arch: x86_64
             pkg-type: package
+          - distro-slug: fedora-37-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: fedora-38
             arch: x86_64
             pkg-type: package
+          - distro-slug: fedora-38-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: photonos-3
             arch: x86_64
             pkg-type: package
@@ -140,15 +164,21 @@ jobs:
           - distro-slug: ubuntu-22.04
             arch: x86_64
             pkg-type: package
-          - distro-slug: ubuntu-22.04-arm64
-            arch: arm64
-            pkg-type: package
           - distro-slug: ubuntu-22.04
             arch: x86_64
             pkg-type: onedir
+          - distro-slug: ubuntu-22.04-arm64
+            arch: arm64
+            pkg-type: package
           - distro-slug: ubuntu-22.04-arm64
             arch: arm64
             pkg-type: onedir
+          - distro-slug: ubuntu-23.04
+            arch: x86_64
+            pkg-type: package
+          - distro-slug: ubuntu-23.04-arm64
+            arch: arm64
+            pkg-type: package
 
     steps:
 

diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py
@@ -4,6 +4,7 @@
 # pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated
 from __future__ import annotations
 
+import json
 import logging
 import shutil
 from typing import TYPE_CHECKING, cast
@@ -18,6 +19,8 @@
 
 WORKFLOWS = tools.utils.REPO_ROOT / ".github" / "workflows"
 TEMPLATES = WORKFLOWS / "templates"
+with tools.utils.REPO_ROOT.joinpath("cicd", "golden-images.json").open() as rfh:
+    AMIS = json.load(rfh)
 
 
 # Define the command group
@@ -216,14 +219,21 @@ def generate_workflows(ctx: Context):
         "fedora",
         "photon",
     ]
-    for slug, display_name, arch, fips in test_salt_listing["linux"]:
-        if slug in ("archlinux-lts", "opensuse-15"):
+    linux_skip_pkg_download_tests = (
+        "archlinux-lts",
+        "opensuse-15",
+        "windows",
+    )
+    for slug in sorted(AMIS):
+        if slug.startswith(linux_skip_pkg_download_tests):
             continue
+        if "arm64" in slug:
+            arch = "arm64"
+        else:
+            arch = "x86_64"
         test_salt_pkg_downloads_listing["linux"].append((slug, arch, "package"))
-    for slug, display_name, arch, fips in test_salt_listing["linux"][-2:]:
-        if slug in ("archlinux-lts", "opensuse-15"):
-            continue
-        test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir"))
+        if slug.startswith("ubuntu-22"):
+            test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir"))
     for slug, display_name, arch in test_salt_listing["macos"]:
         test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package"))
     for slug, display_name, arch in test_salt_listing["macos"][-1:]: