Skip to content

Commit 5101d97

Browse files
authored
Add VMTests ARM64 to workflows. (#347)
Run VMTests against ARM64 in GitHub workflows. Also, run functional tests against ARM64 on Ubuntu host.
1 parent 382ec88 commit 5101d97

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ jobs:
6666
hostArch: amd64
6767
hostDistro: ubuntu2404
6868

69+
tests-functional-ubuntu2404-arm64:
70+
name: Functional tests Ubuntu24.04 ARM64
71+
if: ${{ inputs.runFunctionalTests }}
72+
uses: ./.github/workflows/tests-functional.yml
73+
with:
74+
hostArch: arm64
75+
hostDistro: ubuntu2404
76+
6977
imagecreator-tests-functional-azl3-amd64:
7078
name: Functional tests AZL3 AMD64
7179
if: ${{ inputs.runFunctionalTests }}
@@ -91,15 +99,6 @@ jobs:
9199
hostArch: amd64
92100
hostDistro: azl3
93101

94-
# tests-vmtests-azl3-amd64:
95-
# name: VMTests suite AZL3 ARM64
96-
# if: ${{ inputs.runVMTests }}
97-
# needs: binary-build-arm64
98-
# uses: ./.github/workflows/tests-vmtests.yml
99-
# with:
100-
# hostArch: arm64
101-
# hostDistro: azl3
102-
103102
tests-vmtests-ubuntu2404-amd64:
104103
name: VMTests suite Ubuntu24.04 AMD64
105104
if: ${{ inputs.runVMTests }}
@@ -108,3 +107,12 @@ jobs:
108107
with:
109108
hostArch: amd64
110109
hostDistro: ubuntu2404
110+
111+
tests-vmtests-ubuntu2404-arm64:
112+
name: VMTests suite Ubuntu24.04 ARM64
113+
if: ${{ inputs.runVMTests }}
114+
needs: binary-build-arm64
115+
uses: ./.github/workflows/tests-vmtests.yml
116+
with:
117+
hostArch: arm64
118+
hostDistro: ubuntu2404

.github/workflows/imagecreator-tests-functional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Tests Image Creator functional
2525
runs-on:
2626
- self-hosted
27-
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || 'maritimus-github-runner-ubuntu2404-amd64'}}
27+
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || (inputs.hostArch == 'amd64' && 'maritimus-github-runner-ubuntu2404-amd64' || 'maritimus-github-runner-ubuntu2404-arm64') }}
2828
permissions:
2929
contents: read
3030
steps:

.github/workflows/tests-functional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Funtional test suite
2828
runs-on:
2929
- self-hosted
30-
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || 'maritimus-github-runner-ubuntu2404-amd64'}}
30+
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || (inputs.hostArch == 'amd64' && 'maritimus-github-runner-ubuntu2404-amd64' || 'maritimus-github-runner-ubuntu2404-arm64') }}
3131
permissions:
3232
contents: read
3333
# Azure login.

.github/workflows/tests-vmtests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Tests VMTests suite
2828
runs-on:
2929
- self-hosted
30-
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || 'maritimus-github-runner-ubuntu2404-amd64'}}
30+
- 1ES.Pool=${{ inputs.hostDistro == 'azl3' && (inputs.hostArch == 'amd64' && 'maritimus-github-runner-azl3-amd64' || 'maritimus-github-runner-azl3-arm64') || (inputs.hostArch == 'amd64' && 'maritimus-github-runner-ubuntu2404-amd64' || 'maritimus-github-runner-ubuntu2404-arm64') }}
3131
permissions:
3232
contents: read
3333
# Azure login.
@@ -60,13 +60,13 @@ jobs:
6060
set -eux
6161
6262
sudo apt update -y
63-
sudo apt -y install python3.12-venv python3-pip python3-dev \
63+
sudo apt -y install python3-venv python3-pip python3-dev \
6464
libvirt-dev libvirt-daemon libvirt-daemon-system libvirt-clients \
6565
qemu-kvm virt-manager
6666
6767
# Install arm64 specific
6868
if [[ "$HOST_ARCH" == "arm64" ]]; then
69-
sudo apt -y install qemu-system-arm qemu-efi-aarch64 ovmf vgabios
69+
sudo apt -y install qemu-system-arm qemu-efi-aarch64 ovmf seabios
7070
fi
7171
7272
sudo apt list --installed

0 commit comments

Comments
 (0)