From 5bdd2516808f023f59c75e4219ad39d03089338d Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 9 May 2024 12:55:10 -0400
Subject: [PATCH] update image_name and repo

---
 .github/workflows/test_deployment.yml | 15 +++++----------
 .github/workflows/test_iso.yml        | 16 +++++-----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index 4354aa4..792b68a 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -73,11 +73,8 @@ jobs:
       
       - name: Download generated ISO
         uses: actions/download-artifact@v4
-        env:
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
+          name: ${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
 
       - name: Run VM Tests
         env:
@@ -85,19 +82,17 @@ jobs:
           VM_PASS: foobar
           VM_IP: "127.0.0.1"
           VM_PORT: "5555"
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         run: |
           make test/vm \
             ARCH=${{ needs.load_vars.outputs.ARCH}} \
             ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \
             ${{ matrix.flatpaks == 'flatpak_refs' && format('FLATPAK_REMOTE_REFS="{0}"', needs.load_vars.outputs.FLATPAK_REMOTE_REFS) || '' }} \
             ${{ matrix.flatpaks == 'flatpak_refs_dir' && format('FLATPAK_REMOTE_REFS_DIR="{0}"', needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR) || '' }} \
-            IMAGE_NAME=${{ needs.load_vars.outputs.IMAGE_NAME}} \
-            IMAGE_REPO=${{ needs.load_vars.outputs.IMAGE_REPO}} \
+            IMAGE_NAME=${{ matrix.image_name }} \
+            IMAGE_REPO=${{ matrix.image_repo }} \
             IMAGE_TAG=${{ matrix.version }} \
-            ISO_NAME=${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso \
-            ${{ matrix.version == 'eln' && 'REPOS="repos/centos.repo"' || '' }} \
+            ISO_NAME=${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso \
+            ${{ matrix.repos != '' && format('REPOS="{0}"', matrix.repos) || '' }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
             VARIANT=${{ needs.load_vars.outputs.VARIANT }} \
             VERSION=${{ matrix.version }} \
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index 966fc75..fff2abd 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -73,27 +73,21 @@ jobs:
 
       - name: Download generated ISO
         uses: actions/download-artifact@v4
-        env:
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
+          name: ${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
 
       - name: Run ISO checks
-        env:
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         run: |
           make test/iso \
             ARCH=${{ needs.load_vars.outputs.ARCH}} \
             ENROLLMENT_PASSWORD=${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} \
             ${{ matrix.flatpaks == 'flatpak_refs' && format('FLATPAK_REMOTE_REFS="{0}"', needs.load_vars.outputs.FLATPAK_REMOTE_REFS) || '' }} \
             ${{ matrix.flatpaks == 'flatpak_refs_dir' && format('FLATPAK_REMOTE_REFS_DIR="{0}"', needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR) || '' }} \
-            IMAGE_NAME=${{ env.IMAGE_NAME}} \
-            IMAGE_REPO=${{ env.IMAGE_REPO}} \
+            IMAGE_NAME=${{ matrix.image_name }} \
+            IMAGE_REPO=${{ matrix.image_repo }} \
             IMAGE_TAG=${{ matrix.version }} \
-            ISO_NAME=${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso \
-            ${{ matrix.version == 'eln' && 'REPOS="repos/centos.repo"' || '' }} \
+            ISO_NAME=${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso \
+            ${{ matrix.repos != '' && format('REPOS="{0}"', matrix.repos) || '' }} \
             SECURE_BOOT_KEY_URL=${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} \
             VARIANT=${{ needs.load_vars.outputs.VARIANT }} \
             VERSION=${{ matrix.version == 'eln' && '39' || matrix.version }}