From 5a6dcff5de8aa583b11700fca834a51c875c4013 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:17:53 -0400
Subject: [PATCH] try matrix changes again

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>
---
 .github/workflows/build-image-beta.yml   |  3 ++
 .github/workflows/build-image-gts.yml    |  3 ++
 .github/workflows/build-image-latest.yml |  3 ++
 .github/workflows/build-image-stable.yml |  4 +-
 .github/workflows/build-images.yml       | 14 +++++-
 .github/workflows/reusable-build.yml     | 64 ++++++++++++------------
 6 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
index 4ff39aa74fe..808422d8568 100644
--- a/.github/workflows/build-image-beta.yml
+++ b/.github/workflows/build-image-beta.yml
@@ -24,4 +24,7 @@ jobs:
     secrets: inherit
     with:
       fedora_version: beta
+    strategy:
+      matrix:
+        image_flavor: [main, nvidia]
 
diff --git a/.github/workflows/build-image-gts.yml b/.github/workflows/build-image-gts.yml
index 2f9168ccd60..d0f9122ca7f 100644
--- a/.github/workflows/build-image-gts.yml
+++ b/.github/workflows/build-image-gts.yml
@@ -18,4 +18,7 @@ jobs:
     secrets: inherit
     with:
       fedora_version: gts
+    strategy:
+      matrix:
+        image_flavor: [main, nvidia]
 
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
index 099bd2c6aea..1e8035924f6 100644
--- a/.github/workflows/build-image-latest.yml
+++ b/.github/workflows/build-image-latest.yml
@@ -24,3 +24,6 @@ jobs:
     secrets: inherit
     with:
       fedora_version: latest
+    strategy:
+      matrix:
+        image_flavor: [main, nvidia, hwe, hwe-nvidia]
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
index aa090078d97..b76cabf93cd 100644
--- a/.github/workflows/build-image-stable.yml
+++ b/.github/workflows/build-image-stable.yml
@@ -18,4 +18,6 @@ jobs:
     secrets: inherit
     with:
       fedora_version: stable
-
+    strategy:
+      matrix:
+        image_flavor: [main, nvidia]
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 1e177d56ed1..1238cbf3f20 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -11,12 +11,24 @@ jobs:
     build-image-gts:
         uses: ./.github/workflows/build-image-gts.yml
         secrets: inherit
+        strategy:
+            matrix:
+                base_name: [bluefin, bluefin-dx]
     build-image-stable:
         uses: ./.github/workflows/build-image-stable.yml
         secrets: inherit
+        strategy:
+            matrix:
+                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     build-image-latest:
         uses: ./.github/workflows/build-image-latest.yml
         secrets: inherit
+        strategy:
+            matrix:
+                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     build-image-beta:
         uses: ./.github/workflows/build-image-beta.yml
-        secrets: inherit
\ No newline at end of file
+        secrets: inherit
+        strategy:
+            matrix:
+                base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
\ No newline at end of file
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 6c8a0f11ece..bc47caef2ea 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -24,38 +24,38 @@ jobs:
     continue-on-error: false
     outputs:
       image_full: ${{ steps.generate-outputs.outputs.image }}
-    strategy:
-      fail-fast: false
-      matrix:
-        image_flavor:
-          - main
-          - nvidia
-          - hwe
-          - hwe-nvidia
-        base_name:
-          - bluefin
-          - bluefin-dx
-          - aurora
-          - aurora-dx
-        fedora_version:
-          - ${{ inputs.fedora_version }}
-        exclude:
-          - fedora_version: gts
-            base_name: aurora
-          - fedora_version: gts
-            base_name: aurora-dx
-          - fedora_version: gts
-            image_flavor: hwe
-          - fedora_version: gts
-            image_flavor: hwe-nvidia
-          - fedora_version: stable
-            image_flavor: hwe
-          - fedora_version: stable
-            image_flavor: hwe-nvidia
-          - fedora_version: beta
-            image_flavor: hwe
-          - fedora_version: beta
-            image_flavor: hwe-nvidia
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     image_flavor:
+    #       - main
+    #       - nvidia
+    #       - hwe
+    #       - hwe-nvidia
+    #     base_name:
+    #       - bluefin
+    #       - bluefin-dx
+    #       - aurora
+    #       - aurora-dx
+    #     fedora_version:
+    #       - ${{ inputs.fedora_version }}
+    #     exclude:
+    #       - fedora_version: gts
+    #         base_name: aurora
+    #       - fedora_version: gts
+    #         base_name: aurora-dx
+    #       - fedora_version: gts
+    #         image_flavor: hwe
+    #       - fedora_version: gts
+    #         image_flavor: hwe-nvidia
+    #       - fedora_version: stable
+    #         image_flavor: hwe
+    #       - fedora_version: stable
+    #         image_flavor: hwe-nvidia
+    #       - fedora_version: beta
+    #         image_flavor: hwe
+    #       - fedora_version: beta
+    #         image_flavor: hwe-nvidia
 
     steps:
       - name: Checkout