|
44 | 44 | jobs: |
45 | 45 | prepare: |
46 | 46 | name: VM test |
47 | | - runs-on: ubuntu-22.04 |
| 47 | + runs-on: ${{ matrix.runner }} |
48 | 48 | strategy: |
49 | 49 | matrix: |
50 | | - arch: ["${{ fromJSON(inputs.runner-archs) }}"] |
| 50 | + arch: ${{ fromJSON(inputs.runner-archs) }} |
51 | 51 | 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 | + |
53 | 60 | steps: |
54 | 61 | - uses: actions/checkout@v3 |
55 | 62 | with: |
@@ -190,17 +197,28 @@ jobs: |
190 | 197 | sudo mv containerd-shim-urunc-v2_static_${{ matrix.arch }} /usr/local/bin/containerd-shim-urunc-v2 |
191 | 198 | urunc --version |
192 | 199 |
|
| 200 | + - name: Get architecture |
| 201 | + id: arch |
| 202 | + run: | |
| 203 | + ARCH=$(uname -m) |
| 204 | + echo "arch=$ARCH" >> $GITHUB_OUTPUT |
| 205 | + echo "Architecture: $ARCH" |
| 206 | + |
193 | 207 | - name: Add runner user to KVM group |
| 208 | + if: ${{ matrix.arch == 'amd64' }} |
194 | 209 | id: kvm-setup |
195 | 210 | run: | |
196 | 211 | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules |
197 | 212 | sudo udevadm control --reload-rules |
198 | 213 | sudo udevadm trigger --name-match=kvm |
199 | 214 | sudo usermod -a -G kvm $USER |
200 | 215 |
|
201 | | -
|
202 | 216 | - name: Run ${{ matrix.test }} |
203 | 217 | id: test |
204 | 218 | if: ${{ !cancelled() }} |
205 | 219 | 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