Workflow improvements, namely UI grouping

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

.github/workflows/ci.yml

@@ -1172,7 +1172,7 @@ jobs:
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
 
   amazonlinux-2-pkg-tests:
-    name: Amazon Linux 2
+    name: Amazon Linux 2 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1194,7 +1194,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centos-7-pkg-tests:
-    name: CentOS 7
+    name: CentOS 7 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1216,7 +1216,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-8-pkg-tests:
-    name: CentOS Stream 8
+    name: CentOS Stream 8 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1238,7 +1238,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-9-pkg-tests:
-    name: CentOS Stream 9
+    name: CentOS Stream 9 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1260,7 +1260,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-10-pkg-tests:
-    name: Debian 10
+    name: Debian 10 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1282,7 +1282,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-pkg-tests:
-    name: Debian 11
+    name: Debian 11 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1304,7 +1304,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-arm64-pkg-tests:
-    name: Debian 11 Arm64
+    name: Debian 11 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1326,7 +1326,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-3-pkg-tests:
-    name: Photon OS 3
+    name: Photon OS 3 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1348,7 +1348,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-pkg-tests:
-    name: Photon OS 4
+    name: Photon OS 4 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1370,7 +1370,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-arm64-pkg-tests:
-    name: Photon OS 4 Arm64
+    name: Photon OS 4 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1392,7 +1392,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-pkg-tests:
-    name: Ubuntu 20.04
+    name: Ubuntu 20.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1414,7 +1414,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-arm64-pkg-tests:
-    name: Ubuntu 20.04 Arm64
+    name: Ubuntu 20.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1436,7 +1436,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-pkg-tests:
-    name: Ubuntu 22.04
+    name: Ubuntu 22.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1458,7 +1458,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-arm64-pkg-tests:
-    name: Ubuntu 22.04 Arm64
+    name: Ubuntu 22.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1480,7 +1480,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   macos-12-pkg-tests:
-    name: macOS 12
+    name: macOS 12 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -1502,7 +1502,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-nsis-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1524,7 +1524,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-msi-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1546,7 +1546,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-nsis-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1568,7 +1568,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-msi-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1590,7 +1590,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-nsis-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1612,7 +1612,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-msi-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow

.github/workflows/nightly.yml

@@ -1233,7 +1233,7 @@ jobs:
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
 
   amazonlinux-2-pkg-tests:
-    name: Amazon Linux 2
+    name: Amazon Linux 2 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1255,7 +1255,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centos-7-pkg-tests:
-    name: CentOS 7
+    name: CentOS 7 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1277,7 +1277,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-8-pkg-tests:
-    name: CentOS Stream 8
+    name: CentOS Stream 8 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1299,7 +1299,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-9-pkg-tests:
-    name: CentOS Stream 9
+    name: CentOS Stream 9 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1321,7 +1321,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-10-pkg-tests:
-    name: Debian 10
+    name: Debian 10 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1343,7 +1343,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-pkg-tests:
-    name: Debian 11
+    name: Debian 11 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1365,7 +1365,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-arm64-pkg-tests:
-    name: Debian 11 Arm64
+    name: Debian 11 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1387,7 +1387,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-3-pkg-tests:
-    name: Photon OS 3
+    name: Photon OS 3 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1409,7 +1409,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-pkg-tests:
-    name: Photon OS 4
+    name: Photon OS 4 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1431,7 +1431,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-arm64-pkg-tests:
-    name: Photon OS 4 Arm64
+    name: Photon OS 4 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1453,7 +1453,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-pkg-tests:
-    name: Ubuntu 20.04
+    name: Ubuntu 20.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1475,7 +1475,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-arm64-pkg-tests:
-    name: Ubuntu 20.04 Arm64
+    name: Ubuntu 20.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1497,7 +1497,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-pkg-tests:
-    name: Ubuntu 22.04
+    name: Ubuntu 22.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1519,7 +1519,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-arm64-pkg-tests:
-    name: Ubuntu 22.04 Arm64
+    name: Ubuntu 22.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1541,7 +1541,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   macos-12-pkg-tests:
-    name: macOS 12
+    name: macOS 12 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -1563,7 +1563,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-nsis-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1585,7 +1585,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-msi-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1607,7 +1607,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-nsis-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1629,7 +1629,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-msi-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1651,7 +1651,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-nsis-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1673,7 +1673,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-msi-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow

.github/workflows/release.yml

@@ -224,7 +224,7 @@ jobs:
           tools pkg repo publish release ${{ needs.prepare-workflow.outputs.salt-version }}
 
   almalinux-8-package-download-tests:
-    name: Test Alma Linux 8 package Downloads
+    name: Alma Linux 8 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -247,7 +247,7 @@ jobs:
     secrets: inherit
 
   almalinux-8-arm64-package-download-tests:
-    name: Test Alma Linux 8 Arm64 package Downloads
+    name: Alma Linux 8 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -270,7 +270,7 @@ jobs:
     secrets: inherit
 
   almalinux-9-package-download-tests:
-    name: Test Alma Linux 9 package Downloads
+    name: Alma Linux 9 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -293,7 +293,7 @@ jobs:
     secrets: inherit
 
   almalinux-9-arm64-package-download-tests:
-    name: Test Alma Linux 9 Arm64 package Downloads
+    name: Alma Linux 9 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -316,7 +316,7 @@ jobs:
     secrets: inherit
 
   amazonlinux-2-package-download-tests:
-    name: Test Amazon Linux 2 package Downloads
+    name: Amazon Linux 2 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -339,7 +339,7 @@ jobs:
     secrets: inherit
 
   amazonlinux-2-arm64-package-download-tests:
-    name: Test Amazon Linux 2 Arm64 package Downloads
+    name: Amazon Linux 2 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -362,7 +362,7 @@ jobs:
     secrets: inherit
 
   centos-7-package-download-tests:
-    name: Test CentOS 7 package Downloads
+    name: CentOS 7 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -385,7 +385,7 @@ jobs:
     secrets: inherit
 
   centos-7-arm64-package-download-tests:
-    name: Test CentOS 7 Arm64 package Downloads
+    name: CentOS 7 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -408,7 +408,7 @@ jobs:
     secrets: inherit
 
   centosstream-8-package-download-tests:
-    name: Test CentOS Stream 8 package Downloads
+    name: CentOS Stream 8 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -431,7 +431,7 @@ jobs:
     secrets: inherit
 
   centosstream-8-arm64-package-download-tests:
-    name: Test CentOS Stream 8 Arm64 package Downloads
+    name: CentOS Stream 8 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -454,7 +454,7 @@ jobs:
     secrets: inherit
 
   centosstream-9-package-download-tests:
-    name: Test CentOS Stream 9 package Downloads
+    name: CentOS Stream 9 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -477,7 +477,7 @@ jobs:
     secrets: inherit
 
   centosstream-9-arm64-package-download-tests:
-    name: Test CentOS Stream 9 Arm64 package Downloads
+    name: CentOS Stream 9 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -500,7 +500,7 @@ jobs:
     secrets: inherit
 
   debian-10-package-download-tests:
-    name: Test Debian 10 package Downloads
+    name: Debian 10 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -523,7 +523,7 @@ jobs:
     secrets: inherit
 
   debian-11-package-download-tests:
-    name: Test Debian 11 package Downloads
+    name: Debian 11 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -546,7 +546,7 @@ jobs:
     secrets: inherit
 
   debian-11-arm64-package-download-tests:
-    name: Test Debian 11 Arm64 package Downloads
+    name: Debian 11 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -569,7 +569,7 @@ jobs:
     secrets: inherit
 
   fedora-37-package-download-tests:
-    name: Test Fedora 37 package Downloads
+    name: Fedora 37 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -592,7 +592,7 @@ jobs:
     secrets: inherit
 
   fedora-37-arm64-package-download-tests:
-    name: Test Fedora 37 Arm64 package Downloads
+    name: Fedora 37 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -615,7 +615,7 @@ jobs:
     secrets: inherit
 
   fedora-38-package-download-tests:
-    name: Test Fedora 38 package Downloads
+    name: Fedora 38 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -638,7 +638,7 @@ jobs:
     secrets: inherit
 
   fedora-38-arm64-package-download-tests:
-    name: Test Fedora 38 Arm64 package Downloads
+    name: Fedora 38 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -661,7 +661,7 @@ jobs:
     secrets: inherit
 
   photonos-3-package-download-tests:
-    name: Test Photon OS 3 package Downloads
+    name: Photon OS 3 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -684,7 +684,7 @@ jobs:
     secrets: inherit
 
   photonos-4-package-download-tests:
-    name: Test Photon OS 4 package Downloads
+    name: Photon OS 4 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -707,7 +707,7 @@ jobs:
     secrets: inherit
 
   photonos-4-arm64-package-download-tests:
-    name: Test Photon OS 4 Arm64 package Downloads
+    name: Photon OS 4 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -730,7 +730,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2004-package-download-tests:
-    name: Test Ubuntu 20.04 package Downloads
+    name: Ubuntu 20.04 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -753,7 +753,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2004-arm64-package-download-tests:
-    name: Test Ubuntu 20.04 Arm64 package Downloads
+    name: Ubuntu 20.04 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -776,7 +776,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-package-download-tests:
-    name: Test Ubuntu 22.04 package Downloads
+    name: Ubuntu 22.04 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -799,7 +799,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-package-download-tests:
-    name: Test Ubuntu 22.04 Arm64 package Downloads
+    name: Ubuntu 22.04 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -822,7 +822,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-onedir-download-tests:
-    name: Test Ubuntu 22.04 onedir Downloads
+    name: Ubuntu 22.04 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -845,7 +845,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-onedir-download-tests:
-    name: Test Ubuntu 22.04 Arm64 onedir Downloads
+    name: Ubuntu 22.04 Arm64 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -867,8 +867,8 @@ jobs:
       pkg-type: onedir
     secrets: inherit
 
-  macos-12-Package-download-tests:
-    name: Test macOS 12 Package Downloads
+  macos-12-package-download-tests:
+    name: macOS 12 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -890,8 +890,8 @@ jobs:
       pkg-type: package
     secrets: inherit
 
-  macos-12-Onedir-download-tests:
-    name: Test macOS 12 Onedir Downloads
+  macos-12-onedir-download-tests:
+    name: macOS 12 Package Download
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     needs:
       - prepare-workflow
@@ -913,9 +913,9 @@ jobs:
       pkg-type: onedir
     secrets: inherit
 
-  windows-2022-NSIS-amd64-download-tests:
+  windows-2022-nsis-amd64-download-tests:
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
-    name: Test Windows 2022 amd64 NSIS Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -936,9 +936,9 @@ jobs:
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
-  windows-2022-MSI-amd64-download-tests:
+  windows-2022-msi-amd64-download-tests:
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
-    name: Test Windows 2022 amd64 MSI Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -959,9 +959,9 @@ jobs:
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
-  windows-2022-Onedir-amd64-download-tests:
+  windows-2022-onedir-amd64-download-tests:
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
-    name: Test Windows 2022 amd64 Onedir Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -1021,11 +1021,11 @@ jobs:
       - ubuntu-2204-arm64-package-download-tests
       - ubuntu-2204-onedir-download-tests
       - ubuntu-2204-arm64-onedir-download-tests
-      - macos-12-Package-download-tests
-      - macos-12-Onedir-download-tests
-      - windows-2022-NSIS-amd64-download-tests
-      - windows-2022-MSI-amd64-download-tests
-      - windows-2022-Onedir-amd64-download-tests
+      - macos-12-package-download-tests
+      - macos-12-onedir-download-tests
+      - windows-2022-nsis-amd64-download-tests
+      - windows-2022-msi-amd64-download-tests
+      - windows-2022-onedir-amd64-download-tests
     environment: release
     steps:
       - name: Clone The Salt Repository

.github/workflows/scheduled.yml

@@ -1206,7 +1206,7 @@ jobs:
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
 
   amazonlinux-2-pkg-tests:
-    name: Amazon Linux 2
+    name: Amazon Linux 2 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1228,7 +1228,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centos-7-pkg-tests:
-    name: CentOS 7
+    name: CentOS 7 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1250,7 +1250,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-8-pkg-tests:
-    name: CentOS Stream 8
+    name: CentOS Stream 8 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1272,7 +1272,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-9-pkg-tests:
-    name: CentOS Stream 9
+    name: CentOS Stream 9 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1294,7 +1294,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-10-pkg-tests:
-    name: Debian 10
+    name: Debian 10 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1316,7 +1316,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-pkg-tests:
-    name: Debian 11
+    name: Debian 11 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1338,7 +1338,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-arm64-pkg-tests:
-    name: Debian 11 Arm64
+    name: Debian 11 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1360,7 +1360,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-3-pkg-tests:
-    name: Photon OS 3
+    name: Photon OS 3 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1382,7 +1382,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-pkg-tests:
-    name: Photon OS 4
+    name: Photon OS 4 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1404,7 +1404,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-arm64-pkg-tests:
-    name: Photon OS 4 Arm64
+    name: Photon OS 4 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1426,7 +1426,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-pkg-tests:
-    name: Ubuntu 20.04
+    name: Ubuntu 20.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1448,7 +1448,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-arm64-pkg-tests:
-    name: Ubuntu 20.04 Arm64
+    name: Ubuntu 20.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1470,7 +1470,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-pkg-tests:
-    name: Ubuntu 22.04
+    name: Ubuntu 22.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1492,7 +1492,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-arm64-pkg-tests:
-    name: Ubuntu 22.04 Arm64
+    name: Ubuntu 22.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1514,7 +1514,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   macos-12-pkg-tests:
-    name: macOS 12
+    name: macOS 12 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -1536,7 +1536,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-nsis-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1558,7 +1558,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-msi-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1580,7 +1580,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-nsis-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1602,7 +1602,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-msi-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1624,7 +1624,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-nsis-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1646,7 +1646,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-msi-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow

.github/workflows/staging.yml

@@ -1228,7 +1228,7 @@ jobs:
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
 
   amazonlinux-2-pkg-tests:
-    name: Amazon Linux 2
+    name: Amazon Linux 2 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1250,7 +1250,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centos-7-pkg-tests:
-    name: CentOS 7
+    name: CentOS 7 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1272,7 +1272,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-8-pkg-tests:
-    name: CentOS Stream 8
+    name: CentOS Stream 8 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1294,7 +1294,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   centosstream-9-pkg-tests:
-    name: CentOS Stream 9
+    name: CentOS Stream 9 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1316,7 +1316,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-10-pkg-tests:
-    name: Debian 10
+    name: Debian 10 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1338,7 +1338,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-pkg-tests:
-    name: Debian 11
+    name: Debian 11 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1360,7 +1360,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   debian-11-arm64-pkg-tests:
-    name: Debian 11 Arm64
+    name: Debian 11 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1382,7 +1382,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-3-pkg-tests:
-    name: Photon OS 3
+    name: Photon OS 3 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1404,7 +1404,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-pkg-tests:
-    name: Photon OS 4
+    name: Photon OS 4 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1426,7 +1426,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   photonos-4-arm64-pkg-tests:
-    name: Photon OS 4 Arm64
+    name: Photon OS 4 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1448,7 +1448,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-pkg-tests:
-    name: Ubuntu 20.04
+    name: Ubuntu 20.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1470,7 +1470,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2004-arm64-pkg-tests:
-    name: Ubuntu 20.04 Arm64
+    name: Ubuntu 20.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1492,7 +1492,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-pkg-tests:
-    name: Ubuntu 22.04
+    name: Ubuntu 22.04 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1514,7 +1514,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   ubuntu-2204-arm64-pkg-tests:
-    name: Ubuntu 22.04 Arm64
+    name: Ubuntu 22.04 Arm64 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1536,7 +1536,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   macos-12-pkg-tests:
-    name: macOS 12
+    name: macOS 12 Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -1558,7 +1558,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-nsis-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1580,7 +1580,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2016-msi-pkg-tests:
-    name: Windows 2016
+    name: Windows 2016 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1602,7 +1602,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-nsis-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1624,7 +1624,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2019-msi-pkg-tests:
-    name: Windows 2019
+    name: Windows 2019 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1646,7 +1646,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-nsis-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 NSIS Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -1668,7 +1668,7 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
   windows-2022-msi-pkg-tests:
-    name: Windows 2022
+    name: Windows 2022 MSI Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2915,7 +2915,7 @@ jobs:
           if-no-files-found: error
 
   almalinux-8-package-download-tests:
-    name: Test Alma Linux 8 package Downloads
+    name: Alma Linux 8 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2937,7 +2937,7 @@ jobs:
     secrets: inherit
 
   almalinux-8-arm64-package-download-tests:
-    name: Test Alma Linux 8 Arm64 package Downloads
+    name: Alma Linux 8 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2959,7 +2959,7 @@ jobs:
     secrets: inherit
 
   almalinux-9-package-download-tests:
-    name: Test Alma Linux 9 package Downloads
+    name: Alma Linux 9 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -2981,7 +2981,7 @@ jobs:
     secrets: inherit
 
   almalinux-9-arm64-package-download-tests:
-    name: Test Alma Linux 9 Arm64 package Downloads
+    name: Alma Linux 9 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3003,7 +3003,7 @@ jobs:
     secrets: inherit
 
   amazonlinux-2-package-download-tests:
-    name: Test Amazon Linux 2 package Downloads
+    name: Amazon Linux 2 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3025,7 +3025,7 @@ jobs:
     secrets: inherit
 
   amazonlinux-2-arm64-package-download-tests:
-    name: Test Amazon Linux 2 Arm64 package Downloads
+    name: Amazon Linux 2 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3047,7 +3047,7 @@ jobs:
     secrets: inherit
 
   centos-7-package-download-tests:
-    name: Test CentOS 7 package Downloads
+    name: CentOS 7 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3069,7 +3069,7 @@ jobs:
     secrets: inherit
 
   centos-7-arm64-package-download-tests:
-    name: Test CentOS 7 Arm64 package Downloads
+    name: CentOS 7 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3091,7 +3091,7 @@ jobs:
     secrets: inherit
 
   centosstream-8-package-download-tests:
-    name: Test CentOS Stream 8 package Downloads
+    name: CentOS Stream 8 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3113,7 +3113,7 @@ jobs:
     secrets: inherit
 
   centosstream-8-arm64-package-download-tests:
-    name: Test CentOS Stream 8 Arm64 package Downloads
+    name: CentOS Stream 8 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3135,7 +3135,7 @@ jobs:
     secrets: inherit
 
   centosstream-9-package-download-tests:
-    name: Test CentOS Stream 9 package Downloads
+    name: CentOS Stream 9 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3157,7 +3157,7 @@ jobs:
     secrets: inherit
 
   centosstream-9-arm64-package-download-tests:
-    name: Test CentOS Stream 9 Arm64 package Downloads
+    name: CentOS Stream 9 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3179,7 +3179,7 @@ jobs:
     secrets: inherit
 
   debian-10-package-download-tests:
-    name: Test Debian 10 package Downloads
+    name: Debian 10 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3201,7 +3201,7 @@ jobs:
     secrets: inherit
 
   debian-11-package-download-tests:
-    name: Test Debian 11 package Downloads
+    name: Debian 11 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3223,7 +3223,7 @@ jobs:
     secrets: inherit
 
   debian-11-arm64-package-download-tests:
-    name: Test Debian 11 Arm64 package Downloads
+    name: Debian 11 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3245,7 +3245,7 @@ jobs:
     secrets: inherit
 
   fedora-37-package-download-tests:
-    name: Test Fedora 37 package Downloads
+    name: Fedora 37 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3267,7 +3267,7 @@ jobs:
     secrets: inherit
 
   fedora-37-arm64-package-download-tests:
-    name: Test Fedora 37 Arm64 package Downloads
+    name: Fedora 37 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3289,7 +3289,7 @@ jobs:
     secrets: inherit
 
   fedora-38-package-download-tests:
-    name: Test Fedora 38 package Downloads
+    name: Fedora 38 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3311,7 +3311,7 @@ jobs:
     secrets: inherit
 
   fedora-38-arm64-package-download-tests:
-    name: Test Fedora 38 Arm64 package Downloads
+    name: Fedora 38 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3333,7 +3333,7 @@ jobs:
     secrets: inherit
 
   photonos-3-package-download-tests:
-    name: Test Photon OS 3 package Downloads
+    name: Photon OS 3 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3355,7 +3355,7 @@ jobs:
     secrets: inherit
 
   photonos-4-package-download-tests:
-    name: Test Photon OS 4 package Downloads
+    name: Photon OS 4 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3377,7 +3377,7 @@ jobs:
     secrets: inherit
 
   photonos-4-arm64-package-download-tests:
-    name: Test Photon OS 4 Arm64 package Downloads
+    name: Photon OS 4 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3399,7 +3399,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2004-package-download-tests:
-    name: Test Ubuntu 20.04 package Downloads
+    name: Ubuntu 20.04 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3421,7 +3421,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2004-arm64-package-download-tests:
-    name: Test Ubuntu 20.04 Arm64 package Downloads
+    name: Ubuntu 20.04 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3443,7 +3443,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-package-download-tests:
-    name: Test Ubuntu 22.04 package Downloads
+    name: Ubuntu 22.04 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3465,7 +3465,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-package-download-tests:
-    name: Test Ubuntu 22.04 Arm64 package Downloads
+    name: Ubuntu 22.04 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3487,7 +3487,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-onedir-download-tests:
-    name: Test Ubuntu 22.04 onedir Downloads
+    name: Ubuntu 22.04 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3509,7 +3509,7 @@ jobs:
     secrets: inherit
 
   ubuntu-2204-arm64-onedir-download-tests:
-    name: Test Ubuntu 22.04 Arm64 onedir Downloads
+    name: Ubuntu 22.04 Arm64 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3530,8 +3530,8 @@ jobs:
       pkg-type: onedir
     secrets: inherit
 
-  macos-12-Package-download-tests:
-    name: Test macOS 12 Package Downloads
+  macos-12-package-download-tests:
+    name: macOS 12 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3552,8 +3552,8 @@ jobs:
       pkg-type: package
     secrets: inherit
 
-  macos-12-Onedir-download-tests:
-    name: Test macOS 12 Onedir Downloads
+  macos-12-onedir-download-tests:
+    name: macOS 12 Package Download
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -3574,9 +3574,9 @@ jobs:
       pkg-type: onedir
     secrets: inherit
 
-  windows-2022-NSIS-amd64-download-tests:
+  windows-2022-nsis-amd64-download-tests:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    name: Test Windows 2022 amd64 NSIS Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -3596,9 +3596,9 @@ jobs:
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
-  windows-2022-MSI-amd64-download-tests:
+  windows-2022-msi-amd64-download-tests:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    name: Test Windows 2022 amd64 MSI Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -3618,9 +3618,9 @@ jobs:
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
-  windows-2022-Onedir-amd64-download-tests:
+  windows-2022-onedir-amd64-download-tests:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    name: Test Windows 2022 amd64 Onedir Package Downloads
+    name: Windows 2022 Package Download
     needs:
       - prepare-workflow
       - publish-repositories
@@ -3751,11 +3751,11 @@ jobs:
       - ubuntu-2204-arm64-package-download-tests
       - ubuntu-2204-onedir-download-tests
       - ubuntu-2204-arm64-onedir-download-tests
-      - macos-12-Package-download-tests
-      - macos-12-Onedir-download-tests
-      - windows-2022-NSIS-amd64-download-tests
-      - windows-2022-MSI-amd64-download-tests
-      - windows-2022-Onedir-amd64-download-tests
+      - macos-12-package-download-tests
+      - macos-12-onedir-download-tests
+      - windows-2022-nsis-amd64-download-tests
+      - windows-2022-msi-amd64-download-tests
+      - windows-2022-onedir-amd64-download-tests
     environment: staging
     runs-on:
       - self-hosted

.github/workflows/templates/release.yml.jinja

@@ -259,7 +259,7 @@ permissions:
           tools pkg repo publish <{ gh_environment }> ${{ needs.prepare-workflow.outputs.salt-version }}
 
   <%- if includes.get("test-pkg-downloads", True) %>
-  <%- include "test-pkg-repo-downloads.yml.jinja" %>
+  <%- include "test-salt-pkg-repo-downloads.yml.jinja" %>
   <%- endif %>
 
   release:

.github/workflows/templates/staging.yml.jinja

@@ -158,7 +158,7 @@ concurrency:
           if-no-files-found: error
 
   <%- if includes.get("test-pkg-downloads", True) %>
-  <%- include "test-pkg-repo-downloads.yml.jinja" %>
+  <%- include "test-salt-pkg-repo-downloads.yml.jinja" %>
   <%- endif %>
 
   publish-pypi:

.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja

@@ -1,42 +1,41 @@
-
   <%- set linux_pkg_tests = (
-                               ("almalinux-8", "Alma Linux 8", "x86_64", "package"),
-                               ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "package"),
-                               ("almalinux-9", "Alma Linux 9", "x86_64", "package"),
-                               ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "package"),
-                               ("amazonlinux-2", "Amazon Linux 2", "x86_64", "package"),
-                               ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "package"),
-                               ("centos-7", "CentOS 7", "x86_64", "package"),
-                               ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "package"),
-                               ("centosstream-8", "CentOS Stream 8", "x86_64", "package"),
-                               ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "package"),
-                               ("centosstream-9", "CentOS Stream 9", "x86_64", "package"),
-                               ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "package"),
-                               ("debian-10", "Debian 10", "x86_64", "package"),
-                               ("debian-11", "Debian 11", "x86_64", "package"),
-                               ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "package"),
-                               ("fedora-37", "Fedora 37", "x86_64", "package"),
-                               ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "package"),
-                               ("fedora-38", "Fedora 38", "x86_64", "package"),
-                               ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "package"),
-                               ("photonos-3", "Photon OS 3", "x86_64", "package"),
-                               ("photonos-4", "Photon OS 4", "x86_64", "package"),
-                               ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "package"),
-                               ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "package"),
-                               ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "package"),
-                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "package"),
-                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "package"),
-                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "onedir"),
-                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "onedir")
+                               ("almalinux-8", "Alma Linux 8", "x86_64", "Package"),
+                               ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64", "Package"),
+                               ("almalinux-9", "Alma Linux 9", "x86_64", "Package"),
+                               ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64", "Package"),
+                               ("amazonlinux-2", "Amazon Linux 2", "x86_64", "Package"),
+                               ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "Package"),
+                               ("centos-7", "CentOS 7", "x86_64", "Package"),
+                               ("centos-7-arm64", "CentOS 7 Arm64", "aarch64", "Package"),
+                               ("centosstream-8", "CentOS Stream 8", "x86_64", "Package"),
+                               ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64", "Package"),
+                               ("centosstream-9", "CentOS Stream 9", "x86_64", "Package"),
+                               ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64", "Package"),
+                               ("debian-10", "Debian 10", "x86_64", "Package"),
+                               ("debian-11", "Debian 11", "x86_64", "Package"),
+                               ("debian-11-arm64", "Debian 11 Arm64", "aarch64", "Package"),
+                               ("fedora-37", "Fedora 37", "x86_64", "Package"),
+                               ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64", "Package"),
+                               ("fedora-38", "Fedora 38", "x86_64", "Package"),
+                               ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64", "Package"),
+                               ("photonos-3", "Photon OS 3", "x86_64", "Package"),
+                               ("photonos-4", "Photon OS 4", "x86_64", "Package"),
+                               ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64", "Package"),
+                               ("ubuntu-20.04", "Ubuntu 20.04", "x86_64", "Package"),
+                               ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "Package"),
+                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Package"),
+                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Package"),
+                               ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "Onedir"),
+                               ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "Onedir")
                             ) %>
 
 
   <%- for slug, display_name, arch, pkg_type in linux_pkg_tests %>
-    <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %>
+    <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %>
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
-    name: Test <{ display_name }> <{ pkg_type }> Downloads
+    name: <{ display_name }> Package Download
     <%- if gh_environment == "staging" %>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     <%- else %>
@@ -71,11 +70,11 @@
                                         ("macos-12", "macOS 12", "x86_64", "Package"),
                                         ("macos-12", "macOS 12", "x86_64", "Onedir"),
                                       ) %>
-    <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type) %>
+    <%- set job_name = "{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower()) %>
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
-    name: Test <{ display_name }> <{ pkg_type }> Downloads
+    name: <{ display_name }> Package Download
     <%- if gh_environment == "staging" %>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg-download'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     <%- else %>
@@ -109,7 +108,7 @@
                                         ("windows-2022", "Windows 2022", "amd64"),
                                       ) %>
     <%- for pkg_type in ("NSIS", "MSI", "Onedir") %>
-    <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type, arch.lower()) %>
+    <%- set job_name = "{}-{}-{}-download-tests".format(slug.replace(".", ""), pkg_type.lower(), arch.lower()) %>
 
   <{ job_name }>:
     <%- do test_repo_needs.append(job_name) %>
@@ -118,7 +117,7 @@
     <%- else %>
     if: ${{ inputs.skip-salt-pkg-download-test-suite == false }}
     <%- endif %>
-    name: Test <{ display_name }> <{ arch }> <{ pkg_type }> Package Downloads
+    name: <{ display_name }> Package Download
     needs:
       - prepare-workflow
       - publish-repositories

.github/workflows/templates/test-salt-pkg.yml.jinja

@@ -1,4 +1,3 @@
-
   <%- set linux_pkg_tests = (
                                ("almalinux-8", "Alma Linux 8", "x86_64", "rpm"),
                                ("almalinux-9", "Alma Linux 9", "x86_64", "rpm"),
@@ -39,7 +38,7 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }>
+    name: <{ display_name }> Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -69,7 +68,7 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }>
+    name: <{ display_name }> Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -101,7 +100,7 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }>
+    name: <{ display_name }> <{ pkg_type }> Package
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow

.github/workflows/test-package-downloads-action-linux.yml

@@ -70,13 +70,20 @@ env:
 jobs:
 
   test:
-    name: Test Pkg Download
+    name: Test
     runs-on:
       - self-hosted
       - linux
       - bastion
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - ${{ inputs.arch }}
+        pkg-type:
+          - ${{ inputs.pkg-type }}
 
     steps:
 

.github/workflows/test-package-downloads-action-macos.yml

@@ -68,10 +68,17 @@ env:
 jobs:
 
   test:
-    name: Test Pkg Download
+    name: Test
     runs-on: ${{ inputs.distro-slug }}
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - ${{ inputs.arch }}
+        pkg-type:
+          - ${{ inputs.pkg-type }}
 
     steps:
 

.github/workflows/test-package-downloads-action-windows.yml

@@ -75,13 +75,20 @@ env:
 jobs:
 
   test:
-    name: Test Pkg Download
+    name: Test
     runs-on:
       - self-hosted
       - linux
       - bastion
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - ${{ inputs.arch }}
+        pkg-type:
+          - ${{ inputs.pkg-type }}
 
     steps:
       - name: Checkout Source Code

.github/workflows/test-packages-action-macos.yml

@@ -69,7 +69,7 @@ env:
 jobs:
 
   generate-matrix:
-    name: Test Pkg Matrix
+    name: Generate Matrix
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     outputs:
       pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }}
@@ -93,7 +93,7 @@ jobs:
 
 
   test:
-    name: Test Pkg
+    name: Test
     runs-on: ${{ inputs.distro-slug }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     needs:
@@ -207,7 +207,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Test Pkg Reports
+    name: Report
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     needs:

.github/workflows/test-packages-action.yml

@@ -71,7 +71,7 @@ env:
 jobs:
 
   generate-matrix:
-    name: Test ${{ inputs.pkg-type }} Pkg Matrix
+    name: Generate Matrix
     runs-on:
       - self-hosted
       - linux
@@ -98,7 +98,7 @@ jobs:
 
 
   test:
-    name: Test Pkg
+    name: Test
     runs-on:
       - self-hosted
       - linux
@@ -218,7 +218,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Test Pkg Reports
+    name: Report
     runs-on:
       - self-hosted
       - linux

tools/ci.py

@@ -768,8 +768,6 @@ def pkg_matrix(
                     "version": version,
                 }
             )
-            if distro_slug.startswith("windows"):
-                _matrix[-1]["pkg-type"] = pkg_type.upper()
     ctx.info("Generated matrix:")
     ctx.print(_matrix, soft_wrap=True)