kernelci · broonie · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
diff --git a/config/core/rootfs-configs.yaml b/config/core/rootfs-configs.yaml
@@ -236,8 +236,24 @@ rootfs_configs:
       - wget
       - xz-utils
 
+  bullseye-kvm-unit-tests:
+    rootfs_type: debos
+    debian_release: bullseye
+    arch_list:
+      - amd64
+      - arm64
+    extra_packages:
+      - python3-minimal
+      - qemu-system
+    extra_packages_remove:
+      - bash
+      - e2fslibs
+      - e2fsprogs
+    script: "scripts/bullseye-kvm-unit-tests.sh"
+
   bullseye-libcamera:
     rootfs_type: debos
+    debos_scratchsize: "10G"
     debian_release: bullseye
     arch_list:
       - amd64

diff --git a/config/core/rootfs-images.yaml b/config/core/rootfs-images.yaml
@@ -63,6 +63,57 @@ file_systems:
     ramdisk: bullseye-kselftest/20230519.0/{arch}/rootfs.cpio.gz
     root_type: ramdisk
     type: debian
+  debian_bullseye-kvm-unit-tests_nfs:
+    boot_protocol: tftp
+    nfs: bullseye-kvm-unit-tests/20230114.0/{arch}/full.rootfs.tar.xz
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20230114.0/{arch}/initrd.cpio.gz
+    root_type: nfs
+    type: debian
+  debian_bullseye-kvm-unit-tests_ramdisk:
+    boot_protocol: ramdisk
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20221230.0/{arch}/rootfs.cpio.gz
+    root_type: ramdisk
+    type: debian
+  debian_bullseye-kvm-unit-tests_nfs:
+    boot_protocol: tftp
+    nfs: bullseye-kvm-unit-tests/20230114.0/{arch}/full.rootfs.tar.xz
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20230114.0/{arch}/initrd.cpio.gz
+    root_type: nfs
+    type: debian
+  debian_bullseye-kvm-unit-tests_ramdisk:
+    boot_protocol: ramdisk
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20221230.0/{arch}/rootfs.cpio.gz
+    root_type: ramdisk
+    type: debian
+  debian_bullseye-kvm-unit-tests_nfs:
+    boot_protocol: tftp
+    nfs: bullseye-kvm-unit-tests/20230314.0/{arch}/full.rootfs.tar.xz
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20230314.0/{arch}/initrd.cpio.gz
+    root_type: nfs
+    type: debian-staging
+  debian_bullseye-kvm-unit-tests_ramdisk:
+    boot_protocol: ramdisk
+    params:
+      os_config: debian
+    prompt: '/ #'
+    ramdisk: bullseye-kvm-unit-tests/20230314.0/{arch}/rootfs.cpio.gz
+    root_type: ramdisk
+    type: debian-staging
   debian_bullseye-libcamera_nfs:
     boot_protocol: tftp
     nfs: bullseye-libcamera/20230519.0/{arch}/full.rootfs.tar.xz

diff --git a/config/core/test-configs.yaml b/config/core/test-configs.yaml
@@ -439,6 +439,18 @@ test_plans:
           defconfig: ['kselftest']
           kernel: ['v3.', 'v4.', 'v5.', 'v6.0', 'v6,1', 'v6.2']
 
+  kvm-unit-tests:
+    rootfs: debian_bullseye-kvm-unit-tests_nfs
+    pattern: 'kvm-unit-tests/{category}-{method}-{protocol}-{rootfs}-kvm-unit-tests-template.jinja2'
+    params:
+      job_timeout: '45'
+
+  kvm-unit-tests:
+    rootfs: debian_bullseye-kvm-unit-tests_nfs
+    pattern: 'kvm-unit-tests/{category}-{method}-{protocol}-{rootfs}-kvm-unit-tests-template.jinja2'
+    params:
+      job_timeout: '45'
+
   lc-compliance:
     rootfs: debian_bullseye-libcamera_nfs
     pattern: 'lc-compliance/{category}-{method}-{protocol}-{rootfs}-lc-compliance-template.jinja2'
@@ -2877,6 +2889,7 @@ test_configs:
       - kselftest-kvm
       - kselftest-lib
       - kselftest-seccomp
+      - kvm-unit-tests
       - ltp-crypto
       - ltp-fcntl-locktests
       - ltp-ipc

diff --git a/config/lava/kvm-unit-tests/generic-barebox-tftp-nfs-kvm-unit-tests-template.jinja2 b/config/lava/kvm-unit-tests/generic-barebox-tftp-nfs-kvm-unit-tests-template.jinja2
@@ -0,0 +1,8 @@
+{% extends 'boot-nfs/generic-barebox-tftp-nfs-template.jinja2' %}
+
+{% block actions %}
+{{ super () }}
+
+{% include 'kvm-unit-tests/kvm-unit-tests.jinja2' %}
+
+{% endblock %}
diff --git a/config/lava/kvm-unit-tests/generic-depthcharge-tftp-nfs-kvm-unit-tests-template.jinja2 b/config/lava/kvm-unit-tests/generic-depthcharge-tftp-nfs-kvm-unit-tests-template.jinja2
@@ -0,0 +1,8 @@
+{% extends 'boot-nfs/generic-depthcharge-tftp-nfs-template.jinja2' %}
+
+{% block actions %}
+{{ super () }}
+
+{% include 'kvm-unit-tests/kvm-unit-tests.jinja2' %}
+
+{% endblock %}
diff --git a/config/lava/kvm-unit-tests/generic-grub-tftp-nfs-kvm-unit-tests-template.jinja2 b/config/lava/kvm-unit-tests/generic-grub-tftp-nfs-kvm-unit-tests-template.jinja2
@@ -0,0 +1,8 @@
+{% extends 'boot-nfs/generic-grub-tftp-nfs-template.jinja2' %}
+
+{% block actions %}
+{{ super () }}
+
+{% include 'kvm-unit-tests/kvm-unit-tests.jinja2' %}
+
+{% endblock %}
diff --git a/config/lava/kvm-unit-tests/generic-qemu-ramdisk-kvm-unit-tests-template.jinja2 b/config/lava/kvm-unit-tests/generic-qemu-ramdisk-kvm-unit-tests-template.jinja2
@@ -0,0 +1,11 @@
+{% extends 'boot/generic-qemu-boot-template.jinja2' %}
+{% block actions %}
+{{ super () }}
+
+{% include 'kvm-unit-tests/kvm-unit-tests.jinja2' %}
+
+{% endblock %}
+
+{%- block image_arg %}
+        image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose {{ extra_kernel_args }}"'
+{%- endblock %}
diff --git a/config/lava/kvm-unit-tests/generic-uboot-tftp-nfs-kvm-unit-tests-template.jinja2 b/config/lava/kvm-unit-tests/generic-uboot-tftp-nfs-kvm-unit-tests-template.jinja2
@@ -0,0 +1,8 @@
+{% extends 'boot-nfs/generic-uboot-tftp-nfs-template.jinja2' %}
+
+{% block actions %}
+{{ super () }}
+
+{% include 'kvm-unit-tests/kvm-unit-tests.jinja2' %}
+
+{% endblock %}
diff --git a/config/lava/kvm-unit-tests/kvm-unit-tests.jinja2 b/config/lava/kvm-unit-tests/kvm-unit-tests.jinja2
@@ -0,0 +1,23 @@
+- test:
+    timeout:
+      minutes: {{ job_timeout }}
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: timesync-off
+          description: Disable systemd time sync services
+        run:
+          steps:
+          - systemctl stop systemd-timesyncd || true
+      name: timesync-off
+      path: inline/timesync-off.yaml
+
+    - repository: https://github.com/kernelci/test-definitions.git
+      from: git
+      revision: kernelci.org
+      path: automated/linux/kvm-unit-tests/kvm-unit-tests.yaml
+      name: kvm-unit-tests
+      parameters:
+        SKIP_INSTALL: True
diff --git a/config/rootfs/debos/scripts/bullseye-kvm-unit-tests.sh b/config/rootfs/debos/scripts/bullseye-kvm-unit-tests.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Important: This script is run under QEMU
+
+set -e
+
+RELEASE=2480430a36102f8ea276b3bfb1d64d5dacc23b8f
+
+BUILD_DEPS="\
+      gcc \
+      git \
+      ca-certificates \
+      libc6-dev \
+      make \
+"
+
+apt-get install --no-install-recommends -y ${BUILD_DEPS}
+
+# test-definitions is going to go looking for /opt/kvm-unit-tests
+# so build there
+mkdir -p /opt
+cd /opt
+git clone https://gitlab.com/kvm-unit-tests/kvm-unit-tests
+cd /opt/kvm-unit-tests
+git reset --hard ${RELEASE}
+./configure
+make
+
+# Cleanup: remove files and packages we don't want in the images
+apt-get remove --purge -y ${BUILD_DEPS}
+apt-get remove --purge -y libgtest-dev
+apt-get autoremove --purge -y
+apt-get clean