Add RPi image CI testing

Author: ArrayBolt3

.github/workflows/test-build.yml

@@ -58,6 +58,18 @@ jobs:
         - ubuntu-latest
         - ubuntu-24.04-arm
 
+        target:
+        - VM
+        - RPI
+
+        exclude:
+          # don't try to do raspi tests on amd64
+          - runner: ubuntu-latest
+            target: RPI
+          # don't do raspi tests on <= bookworm hosts, needs at least QEMU 9.x
+          - host_release: bookworm
+            target: RPI
+
     # We want a working shell, qemu, python and docker. Specific version should not matter (much).
     runs-on: ${{ matrix.runner }}
 
@@ -73,22 +85,24 @@ jobs:
       name: "Setup test environment"
 
     - run: ./tests/build-vm-and-test.sh run
-      name: "Build VM image using grml-debootstrap on host ${{matrix.host_release}} for ${{matrix.release}}"
+      name: "Build ${{matrix.target}} image using grml-debootstrap on host ${{matrix.host_release}} for ${{matrix.release}}"
       env:
         HOST_RELEASE: ${{matrix.host_release}}
         RELEASE: ${{matrix.release}}
+        TARGET: ${{matrix.target}}
 
     - run: ./tests/build-vm-and-test.sh test
       id: build_vm_and_test_test
-      name: "Test built VM image for ${{matrix.release}}"
+      name: "Test built ${{matrix.target}} image for ${{matrix.release}}"
       env:
         RELEASE: ${{matrix.release}}
+        TARGET: ${{matrix.target}}
 
     - name: Archive VM image on failure
       uses: actions/upload-artifact@v6
       if: always() && (steps.build_vm_and_test_test.outcome == 'failure')
       with:
-        name: vm-image-${{matrix.host_release}}-${{matrix.release}}-${{matrix.runner}}
+        name: vm-image-${{matrix.host_release}}-${{matrix.release}}-${{matrix.runner}}-${{matrix.target}}
         if-no-files-found: error
         path: qemu.img
         retention-days: 5
@@ -97,6 +111,6 @@ jobs:
       uses: actions/upload-artifact@v6
       if: always()
       with:
-        name: vm-results-${{matrix.host_release}}-${{matrix.release}}-${{matrix.runner}}
+        name: vm-results-${{matrix.host_release}}-${{matrix.release}}-${{matrix.runner}}-${{matrix.target}}
         if-no-files-found: error
         path: tests/results/

tests/build-vm-and-test.sh

@@ -50,7 +50,9 @@ fi
 # Debian version to install using grml-debootstrap
 RELEASE="${RELEASE:-trixie}"
 
-TARGET="${TARGET:-qemu.img}"
+RASPI="${RASPI:-no}"
+
+QEMU_IMG="${QEMU_IMG:-qemu.img}"
 
 if [ "$1" == "run" ]; then
   # Debian version on which grml-debootstrap will *run*
@@ -68,11 +70,11 @@ if [ "$1" == "run" ]; then
     -e TERM="$TERM" \
     -w /code \
     debian:"$HOST_RELEASE" \
-    bash -c './tests/docker-install-deb.sh '"$DEB_NAME"' && ./tests/docker-build-vm.sh '"$(id -u)"' '"/code/$TARGET"' '"$RELEASE"
+    bash -c './tests/docker-install-deb.sh '"$DEB_NAME"' && ./tests/docker-build-vm.sh '"$(id -u)"' '"/code/$QEMU_IMG"' '"$RELEASE"' '"$TARGET"
 
 elif [ "$1" == "test" ]; then
   # run tests from inside Debian system
-  exec ./tests/test-vm.sh "$PWD/$TARGET" "$RELEASE"
+  exec ./tests/test-vm.sh "$PWD/$QEMU_IMG" "$RELEASE" "$RASPI"
 
 else
   echo "$0: unknown parameters, see --help" >&2

tests/docker-build-vm.sh

@@ -6,14 +6,15 @@
 
 set -eu -o pipefail
 
-if [ "$#" -ne 3 ]; then
+if [ "$#" -ne 4 ]; then
   echo "$0: Invalid arguments" >&2
-  echo "Expect: $0 HOST_UID TARGET RELEASE" >&2
+  echo "Expect: $0 HOST_UID TARGET_FILE RELEASE TARGET" >&2
   exit 1
 fi
 HOST_UID="$1"
-TARGET="$2"
+TARGET_FILE="$2"
 RELEASE="$3"
+TARGET="$4"
 
 set -x
 
@@ -23,16 +24,22 @@ MIRROR='https://deb.debian.org/debian'
 echo " ****************************************************************** "
 echo " * Running grml-debootstrap"
 
+if [ "$TARGET" = 'RPI' ]; then
+  extra_buildopts=(--rpifile --non-free)
+else
+  extra_buildopts=(--vmfile)
+fi
+
 grml-debootstrap \
   --debug \
   --force \
-  --vmfile \
-  --vmsize 3G \
-  --target "$TARGET" \
+  "${extra_buildopts[@]}" \
+  --imagesize 3G \
+  --target "$TARGET_FILE" \
   --bootappend "console=ttyS0,115200 console=tty0 vga=791" \
   --password grml \
   --release  "$RELEASE" \
   --hostname "$RELEASE" \
   --mirror "$MIRROR"
 
-chown "$HOST_UID" "$TARGET"
+chown "$HOST_UID" "$TARGET_FILE"

tests/extract-rpi-bootdata.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+VM_IMAGE="$1"
+WORK_DIR="${WORK_DIR:-./rpi-work}"
+KERN_DIR="${KERN_DIR:-./rpi-kernel}"
+
+bail_noremove() {
+  echo "$1" >&2
+  exit 1
+}
+
+cleanup() {
+  if mountpoint "$WORK_DIR" >/dev/null 2>&1; then
+    umount "$WORK_DIR" >/dev/null 2>&1
+  fi
+  rmdir "$WORK_DIR" >/dev/null 2>&1
+  kpartx -d -s -v "$VM_IMAGE" >/dev/null 2>&1
+}
+
+bail() {
+  cleanup
+  bail_noremove "$1"
+}
+
+mkdir --parents "$WORK_DIR" || bail_noremove "Could not create work dir!"
+mkdir --parents "$KERN_DIR" || bail_noremove "Could not create kernel dir!"
+[ "$(cd "$WORK_DIR"; find '.')" = '.' ] || bail_noremove "Work dir is not empty!"
+[ "$(cd "$KERN_DIR"; find '.')" = '.' ] || bail_noremove "Kernel dir is not empty!"
+
+kpartx_info="$(kpartx -a -s -v "$VM_IMAGE")"
+readarray -t kpartx_part_list < <(awk '{ print $3 }' <<< "$kpartx_info")
+[ "${#kpartx_part_list[@]}" = '2' ] || bail "VM image has wrong number of partitions!"
+mount /dev/mapper/"${kpartx_part_list[0]}" "$WORK_DIR"
+config_txt_cont="$(cat "${WORK_DIR}/config.txt")"
+kernel_name="$(grep '^kernel=' <<< "$config_txt_cont" | cut -d'=' -f2 | head -n1)"
+[ -z "$kernel_name" ] && bail 'Could not detect kernel name!'
+initramfs_name="$(grep '^initramfs ' <<< "$config_txt_cont" | cut -d' ' -f2 | head -n1)"
+[ -z "$initramfs_name" ] && bail 'Could not detect initramfs name!'
+cp "${WORK_DIR}/${kernel_name}" "$KERN_DIR"/
+cp "${WORK_DIR}/${initramfs_name}" "$KERN_DIR"/
+umount "$WORK_DIR"
+root_part_uuid="$(grep "${kpartx_part_list[1]}" < <(lsblk -f) | awk '{ print $4 }')"
+cleanup
+echo "${KERN_DIR}/${kernel_name}|${KERN_DIR}/${initramfs_name}|root=UUID=${root_part_uuid} rw"

tests/test-vm.sh

@@ -6,15 +6,16 @@
 
 set -eu -o pipefail
 
-if [ "$#" -ne 2 ]; then
+if [ "$#" -ne 3 ]; then
   echo "$0: Invalid arguments" >&2
-  echo "Expect: $0 VM_IMAGE VM_HOSTNAME" >&2
+  echo "Expect: $0 VM_IMAGE VM_HOSTNAME RASPI" >&2
   exit 1
 fi
 set -x
 
 VM_IMAGE="$1"
 VM_HOSTNAME="$2"
+RASPI="$3"
 
 TEST_PWD="$PWD"
 TEST_TMPDIR=$(mktemp -d)
@@ -28,7 +29,7 @@ bailout() {
     ps --pid="${QEMU_PID}" -o pid= | grep -q '.' && kill "${QEMU_PID:-}"
   fi
 
-  rm -rf "${TEST_TMPDIR}"
+  sudo rm -rf "${TEST_TMPDIR}"
 
   [ -n "${1:-}" ] && EXIT_CODE="$1" || EXIT_CODE=1
   exit "$EXIT_CODE"
@@ -72,17 +73,30 @@ declare -a qemu_command
 
 DPKG_ARCHITECTURE=$(dpkg --print-architecture)
 if [ "${DPKG_ARCHITECTURE}" = "amd64" ]; then
-    qemu_command=( qemu-system-x86_64 )
-    qemu_command+=( -machine q35 )
+  qemu_command=( qemu-system-x86_64 )
+  qemu_command+=( -machine q35 )
 elif [ "${DPKG_ARCHITECTURE}" = "arm64" ]; then
+  if [ "$RASPI" = 'yes' ]; then
+    if ! rpi_bootdata="$(sudo "$TEST_PWD"/tests/extract-rpi-bootdata.sh "$VM_IMAGE")"; then
+      echo "E: could not extract RPi boot data" >&2
+      exit 1
+    fi
+    IFS='|' read rpi_kern rpi_initrd rpi_kerncmd <<< "$rpi_bootdata"
+    qemu_command=( qemu-system-aarch64 )
+    qemu_command+=( -machine "type=virt,gic-version=max,accel=kvm:tcg,highmem=off" )
+    qemu_command+=( -kernel "$rpi_kern" )
+    qemu_command+=( -initrd "$rpi_initrd" )
+    qemu_command+=( -append "$rpi_kerncmd" )
+  else
     cp /usr/share/AAVMF/AAVMF_VARS.fd efi_vars.fd
     qemu_command=( qemu-system-aarch64 )
     qemu_command+=( -machine "type=virt,gic-version=max,accel=kvm:tcg" )
     qemu_command+=( -drive "if=pflash,format=raw,unit=0,file.filename=/usr/share/AAVMF/AAVMF_CODE.no-secboot.fd,file.locking=off,readonly=on" )
     qemu_command+=( -drive "if=pflash,format=raw,unit=1,file=efi_vars.fd" )
+  fi
 else
-    echo "E: unsupported ${DPKG_ARCHITECTURE}"
-    exit 1
+  echo "E: unsupported ${DPKG_ARCHITECTURE}" >&2
+  exit 1
 fi
 qemu_command+=( -cpu max )
 qemu_command+=( -smp 2 )