From 612b2356faff76971aa5dc715b59e52e387c175d Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@collabora.com>
Date: Fri, 29 Dec 2023 14:47:17 +0100
Subject: [PATCH] Also run tests on self-hosted kvm runner

kvm is the recommended backend for fakemachine; Unfortunately github
hosted runners don't always support virtualization[0]. Luckily the debos
organisation now has a kvm supported self-hosted runner sponsored by
Collabora, so use that for kvm tests.

This also simplifies the matrix properties for jobs, moving their quirks
into expressions instead. Simple tests for building non-debian
distributions (arch, apertis) are now ran on kvm as well

0: The github-hosted runners are sometimes the documented intel xeon
   based-instance type without virt support.. and sometimes amd epyc
   with virt support.

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
---
 .github/workflows/ci.yaml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53078f0e..5c33cf34 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -114,37 +114,37 @@ jobs:
             up --exit-code-from=sut
 
   recipe-tests:
-    runs-on: ubuntu-latest
     needs: build
     strategy:
       fail-fast: false
       matrix:
         backend:
-          - { name: "nofakemachine", backend: "--disable-fakemachine", install_qemu: true }
-          - { name: "qemu", backend: "--fakemachine-backend=qemu" }
-          - { name: "uml", backend: "--fakemachine-backend=uml" }
+          - nofakemachine
+          - qemu
+          - uml
+          - kvm
         test:
           - { name: "recipes", case: "recipes" }
           - { name: "escaping", case: "escaping", variables: " -t escaped:\\$ba\\'d\\$gers\\ snakes" }
           - { name: "debian (amd64)", case: "debian", variables: "-t architecture:amd64" }
           - { name: "debian (arm64)", case: "debian", variables: "-t architecture:arm64" }
           - { name: "debian (armhf)", case: "debian", variables: "-t architecture:armhf" }
+        exclude:
+          - backend: nofakemachine
+            test: { name: "partitioning", case: "partitioning" }
         include:
-          - backend: { name: "arch", backend: "--fakemachine-backend=qemu" }
+          - backend: kvm
             test: { name: "arch", case: "arch" }
-          - backend: { name: "qemu", backend: "--fakemachine-backend=qemu" }
-            test: { name: "partitioning", case: "partitioning" }
-          - backend: { name: "uml", backend: "--fakemachine-backend=uml" }
+          - backend: kvm
             test: { name: "apertis", case: "apertis" }
-          - backend: { name: "uml", backend: "--fakemachine-backend=uml" }
-            test: { name: "partitioning", case: "partitioning" }
-    name: ${{matrix.test.name}} on ${{matrix.backend.name}}
+    name: ${{matrix.test.name}} on ${{matrix.backend}}
+    runs-on: ${{ matrix.backend == 'kvm' && 'kvm' || 'ubuntu-latest' }}
     steps:
       - name: Repository checkout
         uses: actions/checkout@v4
 
       - name: Install QEMU emulation binaries
-        if: matrix.backend.install_qemu
+        if: ${{ matrix.backend == 'nofakemachine' }}
         run: |
           sudo apt-get update && sudo apt-get install -y qemu-user-static
 
@@ -165,11 +165,12 @@ jobs:
           -w /tests
           --tmpfs /scratch:exec
           --tmpfs /run
+          ${{ matrix.backend.name == 'kvm' && '--device /dev/kvm' || '' }}
           --privileged
           -e TMP=/scratch
           -e SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=1
           debos -v
-          ${{matrix.backend.backend}}
+          ${{matrix.backend == 'nofakemachine' && '--disable-fakemachine' || format('{0}{1}', '--fakemachine-backend=',matrix.backend) }}
           ${{matrix.test.variables}}
           ${{matrix.test.case}}/test.yaml