From 364ca718fbf334028b7c4cad791f1878ffba3ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:53:00 +0100
Subject: [PATCH] Remove duplicated step uploading ova QEMU image for the test
 job (#3011)

* Remove duplicated step uploading ova QEMU image for the test job

Instead of uploading the file twice with a fixed name, upload it in the
same step that is used for unpublished builds and pass the version string
to the test job.

* Update .github/workflows/test.yaml

Co-authored-by: Stefan Agner <stefan@agner.ch>

---------

Co-authored-by: Stefan Agner <stefan@agner.ch>
---
 .github/workflows/build.yaml | 13 ++++---------
 .github/workflows/test.yaml  |  6 +++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d57b1d99d..0240f8e60 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -309,14 +309,6 @@ jobs:
             echo "| ${f} | $(du -b output/images/$f | cut -f1) | $(du -bh output/images/$f | cut -f1) |" >> $GITHUB_STEP_SUMMARY
           done
 
-      - name: Upload ova image to artifacts for the test job
-        uses: actions/upload-artifact@v4
-        if: ${{ matrix.board.id == 'ova' }}
-        with:
-          name: ova-image
-          path: |
-            output/images/haos_ova*.qcow2.xz
-
       - name: Upload OS image artifact
         uses: actions/upload-artifact@v4
         if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id != 'ova' }}
@@ -343,7 +335,8 @@ jobs:
 
       - name: Upload QEMU disk image artifact
         uses: actions/upload-artifact@v4
-        if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
+        # Create artifact for ova every time - it's used by the called tests workflow
+        if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
         with:
           name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
           path: |
@@ -377,6 +370,8 @@ jobs:
     name: Test OS image
     needs: [ build, prepare ]
     uses: ./.github/workflows/test.yaml
+    with:
+      version: ${{ needs.prepare.outputs.version_full }}
 
   update_index:
     name: Update artifacts index
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 84be9d0d8..980b98e9c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,6 +19,10 @@ on:
         required: false
         type: boolean
         default: true
+      version:
+        description: Version of HAOS to test (as used in the name of the qcow2 image artifact)
+        required: true
+        type: string
 
 jobs:
   test:
@@ -58,7 +62,7 @@ jobs:
         if: ${{ inputs.use-artifact }}
         uses: actions/download-artifact@v4
         with:
-          name: ova-image
+          name: haos_ova-${{ inputs.version }}.qcow2.xz
 
       - name: Extract OS image
         run: |