Skip to content

Commit 33975c0

Browse files
author
Georgios Ntoutsos
committed
wip: only run spt tests on arm
Signed-off-by: Georgios Ntoutsos <gntouts@nubificus.co.uk>
1 parent e8c792d commit 33975c0

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

.github/workflows/vm_test.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,19 @@ on:
4444
jobs:
4545
prepare:
4646
name: VM test
47-
runs-on: ubuntu-22.04
47+
runs-on: ${{ matrix.runner }}
4848
strategy:
4949
matrix:
50-
arch: ["${{ fromJSON(inputs.runner-archs) }}"]
50+
arch: ${{ fromJSON(inputs.runner-archs) }}
5151
test: ["test_ctr","test_nerdctl","test_crictl","test_docker"]
52-
fail-fast: false
52+
include:
53+
- arch: amd64
54+
runner: ubuntu-22.04
55+
- arch: arm64
56+
runner: ubuntu-22.04-arm
57+
58+
continue-on-error: true
59+
5360
steps:
5461
- uses: actions/checkout@v3
5562
with:
@@ -190,17 +197,28 @@ jobs:
190197
sudo mv containerd-shim-urunc-v2_static_${{ matrix.arch }} /usr/local/bin/containerd-shim-urunc-v2
191198
urunc --version
192199
200+
- name: Get architecture
201+
id: arch
202+
run: |
203+
ARCH=$(uname -m)
204+
echo "arch=$ARCH" >> $GITHUB_OUTPUT
205+
echo "Architecture: $ARCH"
206+
193207
- name: Add runner user to KVM group
208+
if: ${{ matrix.arch == 'amd64' }}
194209
id: kvm-setup
195210
run: |
196211
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
197212
sudo udevadm control --reload-rules
198213
sudo udevadm trigger --name-match=kvm
199214
sudo usermod -a -G kvm $USER
200215
201-
202216
- name: Run ${{ matrix.test }}
203217
id: test
204218
if: ${{ !cancelled() }}
205219
run: |
206-
sudo make ${{ matrix.test }}
220+
if [ "${{ matrix.arch }}" = "arm64" ]; then
221+
sudo make ${{ matrix.test }}_Spt
222+
else
223+
sudo make ${{ matrix.test }}
224+
fi

0 commit comments

Comments
 (0)