From 971f3f188dfa47124b2a154c268e407c385d7ba9 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Thu, 5 Dec 2024 13:43:18 -0700
Subject: [PATCH] Try matrix without include

---
 .github/workflows/test-action.yml          | 23 ++++++++++------------
 .github/workflows/test-packages-action.yml | 11 +++--------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
index 8d46213b2c2..aeb45b74f6b 100644
--- a/.github/workflows/test-action.yml
+++ b/.github/workflows/test-action.yml
@@ -66,7 +66,7 @@ env:
 jobs:
 
   test-linux:
-    name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}
+    name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }} ${{ matrix.fips && '--fips ' || '' }}
     if: ${{ fromJSON(inputs.matrix)['linux'] != '[]' }}
     runs-on:
       - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
@@ -77,8 +77,7 @@ jobs:
     timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['linux'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
     env:
       SALT_TRANSPORT: ${{ matrix.transport }}
 
@@ -176,7 +175,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            -k "mac or darwin" --core-tests --slow-tests --suppress-no-test-exit-code \
+            --core-tests --slow-tests --suppress-no-test-exit-code \
             --from-filenames=testrun-changed-files.txt
 
       - name: Run Fast Tests
@@ -194,7 +193,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            -k "mac or darwin" --suppress-no-test-exit-code
+            --suppress-no-test-exit-code
 
       - name: Run Slow Tests
         id: run-slow-tests
@@ -211,7 +210,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests
+            --suppress-no-test-exit-code --no-fast-tests --slow-tests
 
       - name: Run Core Tests
         id: run-core-tests
@@ -228,7 +227,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests
+            --suppress-no-test-exit-code --no-fast-tests --core-tests
 
       - name: Run Flaky Tests
         id: run-flaky-tests
@@ -245,7 +244,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
+            --suppress-no-test-exit-code --no-fast-tests --flaky-jail
 
       - name: Run Full Tests
         id: run-full-tests
@@ -262,7 +261,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ matrix.slug }}
         run: |
           nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
-            --slow-tests --core-tests -k "mac or darwin"
+            --slow-tests --core-tests
 
       - name: Fix file ownership
         run: |
@@ -321,8 +320,7 @@ jobs:
     timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['macos'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['macos'] }}
     env:
       SALT_TRANSPORT: ${{ matrix.transport }}
 
@@ -555,8 +553,7 @@ jobs:
     timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['windows'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['windows'] }}
     env:
       SALT_TRANSPORT: ${{ matrix.transport }}
 
diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml
index 906e65905c3..ef0a5fe30e5 100644
--- a/.github/workflows/test-packages-action.yml
+++ b/.github/workflows/test-packages-action.yml
@@ -67,9 +67,7 @@ jobs:
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['linux'] }}
-
+      matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
     steps:
 
       - name: "Throttle Builds"
@@ -191,9 +189,7 @@ jobs:
     timeout-minutes: 150  # 2 & 1/2 Hours - More than this and something is wrong (MacOS needs a little more time)
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['macos'] }}
-
+      matrix: ${{ fromJSON(inputs.matrix)['macos'] }}
     steps:
 
       - name: "Throttle Builds"
@@ -309,8 +305,7 @@ jobs:
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['linux'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     steps: