From ae711734bfbe58119f7ea35eae261f17bfdc7f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= <sairon@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:42:03 +0100
Subject: [PATCH] Run tests within build workflow (#2882)

---
 .github/workflows/build.yaml |  5 +++++
 .github/workflows/test.yaml  | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c1c30a681..a04bf32f1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -242,6 +242,11 @@ jobs:
           path: |
             output/images/haos_ova*.qcow2.xz
 
+  test:
+    name: Test OS image
+    needs: [ build, prepare ]
+    uses: ./.github/workflows/test.yaml
+
   bump_version:
     name: Bump ${{ needs.prepare.outputs.channel }} channel version
     if: ${{ github.repository == 'home-assistant/operating-system' }}
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6c07bfef0..4ae6dfd6e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -2,6 +2,7 @@ name: Test HAOS image
 run-name: "Test HAOS ${{ inputs.version || format('(OS build #{0})', github.event.workflow_run.run_number) }}"
 
 on:
+  # Manual test of specified version
   workflow_dispatch:
     inputs:
       version:
@@ -9,10 +10,8 @@ on:
         required: true
         type: string
 
-  workflow_run:
-    workflows: ["OS build"]  # must be in sync with build workflow `name`
-    types:
-      - completed
+  # Called by other workflows (e.g. build.yaml)
+  workflow_call:
 
 jobs:
   test:
@@ -49,11 +48,9 @@ jobs:
           curl -sfL -o haos.qcow2.xz  https://os-artifacts.home-assistant.io/${{github.event.inputs.version}}/haos_ova-${{github.event.inputs.version}}.qcow2.xz
 
       - name: Get OS image artifact
-        if: ${{ github.event_name == 'workflow_run' }}
-        uses: dawidd6/action-download-artifact@v2
+        if: ${{ github.event_name == 'workflow_call' }}
+        uses: actions/download-artifact@v3
         with:
-          workflow: build.yaml
-          workflow_conclusion: success
           name: ova-image
 
       - name: Extract OS image