Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicated step uploading ova QEMU image for the test job #3011

Merged
merged 2 commits into from
Dec 26, 2023
Merged

Remove duplicated step uploading ova QEMU image for the test job #3011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6943bea
Remove duplicated step uploading ova QEMU image for the test job
sairon Dec 20, 2023
e9c69e1
Update .github/workflows/test.yaml
sairon Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,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' }}
Expand All @@ -310,7 +302,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: |
Expand Down Expand Up @@ -344,6 +337,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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
required: false
type: boolean
default: true
version:
description: Version of HAOS to test (used in name of the qcow2 image artifact)
sairon marked this conversation as resolved.
Show resolved Hide resolved
required: true
type: string

jobs:
test:
Expand Down Expand Up @@ -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: |
Expand Down
Loading