Merge pull request #375 from grml/zeha/forky

Add forky as a selectable release and to CI

Author: zeha

.github/workflows/test-build.yml

@@ -53,6 +53,7 @@ jobs:
         - bookworm
 
         release:
+        - forky
         - trixie
         - bookworm
 

config

@@ -69,7 +69,7 @@
 # BACKPORTREPOS='yes'
 
 # Debian release that should be installed.
-# Supported values: bookworm, trixie, sid
+# Supported values: bookworm, trixie, forky, sid
 # Default: 'trixie'
 # RELEASE='trixie'
 

grml-debootstrap

@@ -893,9 +893,10 @@ prompt_for_release()
   RELEASE="$(dialog --stdout --title "${PN}" --default-item "$default_value" --menu \
             "Please enter the Debian release you would like to use for installation:" \
             16 50 5 \
-            bookworm Debian/12 \
-            trixie   Debian/13 \
-            sid      Debian/unstable)" \
+            bookworm "Debian/12" \
+            trixie   "Debian/13" \
+            forky    "Debian/14 UNRELEASED" \
+            sid      "Debian/unstable")" \
             || bailout
 }
 # }}}

grml-debootstrap.8.adoc

@@ -219,7 +219,7 @@ Options and environment variables
 *-r*, *--release* _releasename_::
 
     Specify release of new Debian system. Supported releases names:
-    bookworm, trixie and sid.
+    bookworm, trixie, forky and sid.
     Corresponding with configuration variable RELEASE. Default release: trixie
 
 *--remove-configs*::
@@ -414,15 +414,17 @@ Supported Releases
 |Release  |Status
 |bookworm |works
 |trixie   |works
+|forky    |works[1]
 |sid      |works[1]
 |======================
 
 [NOTE]
 .unstable and testing releases
 ================================================================================
-[1] Please notice that Debian/testing and Debian/unstable (sid) might
-not be always installable due to their nature. What _might_ work instead is
-deploying a stable release and upgrade it after installation finished.
+[1] Please notice that Debian/testing (currently: forky) and Debian/unstable
+(sid) might not be always installable due to their nature. What _might_
+work instead is deploying a stable release and upgrade it after installation
+finished.
 ================================================================================
 
 Bugs

packer/debian64_provision.sh

@@ -202,7 +202,7 @@ grml_debootstrap_execution() {
 apply_nic_workaround() {
   # release specific stuff
   case "$DEBIAN_VERSION" in
-    bookworm|trixie|unstable|sid)
+    bookworm|trixie|forky|unstable|sid)
       ;;
     *)
       echo "* Debian $DEBIAN_VERSION doesn't require NIC workaround"

tests/docker-build-vm.sh

@@ -30,13 +30,22 @@ else
   extra_buildopts=(--vmfile)
 fi
 
+# arm64 'virt' machines expose a pl011 UART as ttyAMA0 with no VGA console;
+# amd64 has the traditional 8250 UART at ttyS0 plus a VGA tty0.
+DPKG_ARCHITECTURE="$(dpkg --print-architecture)"
+if [ "$DPKG_ARCHITECTURE" = 'arm64' ]; then
+  bootappend="console=ttyAMA0,115200 console=tty0"
+else
+  bootappend="console=ttyS0,115200 console=tty0 vga=791"
+fi
+
 grml-debootstrap \
   --debug \
   --force \
   "${extra_buildopts[@]}" \
   --imagesize 3G \
   --target "$TARGET_FILE" \
-  --bootappend "console=ttyS0,115200 console=tty0 vga=791" \
+  --bootappend "$bootappend" \
   --password grml \
   --release  "$RELEASE" \
   --hostname "$RELEASE" \

tests/test-vm.sh

@@ -75,30 +75,30 @@ DPKG_ARCHITECTURE=$(dpkg --print-architecture)
 if [ "${DPKG_ARCHITECTURE}" = "amd64" ]; then
   qemu_command=( qemu-system-x86_64 )
   qemu_command+=( -machine q35 )
+  qemu_command+=( -cpu max )
 elif [ "${DPKG_ARCHITECTURE}" = "arm64" ]; then
+  # Pick a real CPU model, and also one that does not crash QEMU on ubuntu-24.04-arm.
+  qemu_command=( qemu-system-aarch64 )
+  qemu_command+=( -machine "type=virt,gic-version=max,accel=kvm:tcg" )
+  qemu_command+=( -cpu cortex-a76 )
   if [ "$TARGET" = 'RPI' ]; 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}" >&2
   exit 1
 fi
-qemu_command+=( -cpu max )
 qemu_command+=( -smp 2 )
 qemu_command+=( -m 2048 )
 qemu_command+=( -drive "file=${VM_IMAGE},format=raw,index=0,media=disk" )
@@ -124,6 +124,13 @@ if [ ! -d results ] || [ ! -f ./results/goss.tap ] || [ ! -f ./results/goss.exit
   echo "Running tests inside VM failed for unknown reason" >&2
   RC=1
   cat results/goss.err || true
+  if ! kill -0 "${QEMU_PID}" 2>/dev/null; then
+    echo "E: qemu (pid ${QEMU_PID}) has exited" >&2
+  fi
+  if [ -r qemu.log ]; then
+    echo "qemu.log follows:" >&2
+    cat qemu.log >&2
+  fi
 else
   RC=$(cat results/goss.exitcode)
   echo "goss exitcode: $RC"