From e99201ca0b763ba85d4ea0cfb30392f33189c0a7 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Fri, 6 Dec 2024 03:41:26 -0700
Subject: [PATCH] Clean up workflows

---
 .github/workflows/build-deps-onedir.yml      | 2 +-
 .github/workflows/build-packages.yml         | 4 ++--
 .github/workflows/build-salt-onedir.yml      | 2 +-
 .github/workflows/lint-action.yml            | 4 ++--
 .github/workflows/pre-commit-action.yml      | 2 +-
 .github/workflows/release-tag.yml            | 2 +-
 .github/workflows/release-update-winrepo.yml | 2 +-
 .github/workflows/test-action.yml            | 6 ++----
 tools/ci.py                                  | 2 +-
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml
index 8bb6ba00b13..5ee054ba79b 100644
--- a/.github/workflows/build-deps-onedir.yml
+++ b/.github/workflows/build-deps-onedir.yml
@@ -40,7 +40,7 @@ jobs:
   build-deps-linux:
     name: Linux
     runs-on:
-      - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
+      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index e3b5fa1487d..abf17b5b754 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -53,7 +53,7 @@ jobs:
   build-deb-packages:
     name: DEB
     runs-on:
-      - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
+      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
     strategy:
       fail-fast: false
       matrix:
@@ -145,7 +145,7 @@ jobs:
   build-rpm-packages:
     name: RPM
     runs-on:
-      - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
+      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
index 79a34e93469..c26b21b83ed 100644
--- a/.github/workflows/build-salt-onedir.yml
+++ b/.github/workflows/build-salt-onedir.yml
@@ -43,7 +43,7 @@ jobs:
     env:
       USE_S3_CACHE: 'false'
     runs-on:
-      - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
+      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml
index b696c72a943..09f614fbf36 100644
--- a/.github/workflows/lint-action.yml
+++ b/.github/workflows/lint-action.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   Salt:
     name: Lint Salt's Source Code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
 
     container:
@@ -58,7 +58,7 @@ jobs:
 
   Tests:
     name: Lint Salt's Test Suite
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }}
 
     container:
diff --git a/.github/workflows/pre-commit-action.yml b/.github/workflows/pre-commit-action.yml
index d662c5335cd..fa9cacd1f66 100644
--- a/.github/workflows/pre-commit-action.yml
+++ b/.github/workflows/pre-commit-action.yml
@@ -21,7 +21,7 @@ jobs:
   Pre-Commit:
     name: Run Pre-Commit Against Salt
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index bc4624ef086..7d88b2d63f6 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -32,7 +32,7 @@ jobs:
     permissions:
       contents: write  # for dev-drprasad/delete-tag-and-release to delete tags or releases
     name: Generate Tag and Github Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: dev-drprasad/delete-tag-and-release@v0.2.0
       if: github.event.inputs.reTag == 'true'
diff --git a/.github/workflows/release-update-winrepo.yml b/.github/workflows/release-update-winrepo.yml
index 4282709d72b..542301f98c4 100644
--- a/.github/workflows/release-update-winrepo.yml
+++ b/.github/workflows/release-update-winrepo.yml
@@ -19,7 +19,7 @@ permissions:
 jobs:
   update-winrepo:
     name: Update Winrepo
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
     - name: Checkout Salt
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
index 53ab6ba8c68..f2fff4dc8c8 100644
--- a/.github/workflows/test-action.yml
+++ b/.github/workflows/test-action.yml
@@ -87,9 +87,6 @@ jobs:
       #   with:
       #     python-version: '3.10'
       #
-      - name: Test Matrix
-        run: |
-          "${{ toJSON(matrix) }}"
 
       - name: Check python
         run: |
@@ -555,7 +552,8 @@ jobs:
     timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJSON(inputs.matrix)['windows'] }}
+      matrix:
+        include: ${{ fromJSON(inputs.matrix)['windows'] }}
     env:
       SALT_TRANSPORT: ${{ matrix.transport }}
     steps:
diff --git a/tools/ci.py b/tools/ci.py
index 3d419ec9f8b..adb431f6384 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -1601,7 +1601,7 @@ def workflow_config(
     ctx.info(f"str_releases {str_releases}")
 
     platforms = ["linux", "macos", "windows"]
-    pkg_test_matrix = {}
+    pkg_test_matrix: dict[str, list] = {_: [] for _ in platforms}
 
     if os.environ.get("LINUX_ARM_RUNNER", "0") == "0":
         TEST_SALT_LISTING["linux"] = list(