testing: Add test for sdcard

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

Author: legionus

.github/workflows/ci.yml

@@ -103,6 +103,7 @@ jobs:
           "raid1+raid5",
           "raid1-degraded",
           "raid5",
+          "sdcard",
           "xfs-partition",
           "zfs-partition",
         ]

testing/packages-fedora

@@ -9,7 +9,7 @@ MAKE_INITRD_PACKAGES_DEVEL+=" kmod-devel zlib-ng-devel bzip2-devel xz-devel libx
 MAKE_INITRD_PACKAGES_DEVEL+=" libzstd-devel elfutils-libelf-devel libtirpc-devel"
 MAKE_INITRD_PACKAGES_DEVEL+=" json-c-devel"
 
-KERNEL_PACKAGES="kernel$KERNEL_FLAVOR"
+KERNEL_PACKAGES="kernel$KERNEL_FLAVOR kernel-modules"
 
 BOOTLOADER_EFI_PACKAGES="grub2-efi-x64 grub2-efi-x64-modules"
 BOOTLOADER_PC_PACKAGES="grub2-pc grub2-pc-modules"

testing/sh-functions

@@ -1,6 +1,12 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+KICKSTART_DISKS=0
+KICKSTART_SDCARDS=0
+BOOT_DISKS=0
+BOOT_SDCARDS=0
+BOOT_CMDLINE=""
+
 PROG="${0##*/}"
 TEST=
 message()
@@ -193,6 +199,7 @@ create_qemu_wrapper()
 	. "$top_workdir/qemu-cpu"
 	. "$top_workdir/qemu-efi"
 	. "$top_workdir/qemu-disks"
+	. "$top_workdir/qemu-sdcards"
 	set -x
 	exec qemu-system-$ARCH "\${qemu_args[@]}"
 	EOF
@@ -211,7 +218,7 @@ qemu_create_disk()
 	i="$1"; shift
 	fn="$1"; shift
 	fmt="${QEMU_DISK_FORMAT:-qcow2}"
-	size="3G"
+	size="4G"
 
 	[ ! -f "$fn" ] ||
 		return 0
@@ -245,10 +252,32 @@ qemu_init_blockdev()
 {
 	:> "$top_workdir/disks.map"
 	:> "$top_workdir/qemu-disks"
+	:> "$workdir/qemu-sdcards"
 
 	qemu_args \
 	 -device "virtio-scsi-pci,id=scsi" \
 	 >"$workdir/qemu-disks"
+
+	qemu_args \
+	 -device "sdhci-pci" \
+	 >"$workdir/qemu-sdcards"
+}
+
+qemu_add_sdcard()
+{
+	local fn fmt i
+
+	i="$1"; shift
+	fn="$1"; shift
+
+	[ "$#" -eq 0 ] &&
+		fmt="${QEMU_SDCARD_FORMAT:-qcow2}" ||
+		fmt="$1"
+
+	qemu_args \
+	 -device "sd-card,drive=sdcard-$i" \
+	 -drive "id=sdcard-$i,if=none,format=$fmt,file=$fn" \
+	 >>"$workdir/qemu-sdcards"
 }
 
 qemu_add_disk()
@@ -279,6 +308,10 @@ qemu_setup_boot_disks()
 	done
 
 	qemu_activate_disks
+
+	for (( i=1; i <= BOOT_SDCARDS; i++ )); do
+		qemu_add_sdcard "$i" "$top_workdir/sdcard-$i.img"
+	done
 }
 
 qemu_setup_kickstart_disks()
@@ -299,6 +332,15 @@ qemu_setup_kickstart_disks()
 	done
 
 	qemu_activate_disks
+
+	for (( i=1; i <= KICKSTART_SDCARDS; i++ )); do
+		message "creating QEMU sdcard $i ..."
+
+		fn="$top_workdir/sdcard-$i.img"
+
+		qemu_create_disk "$i" "$fn"
+		qemu_add_sdcard "$i" "$fn"
+	done
 }
 
 qemu_calc_boot_duration()

testing/test-root-sdcard.cfg

@@ -0,0 +1,12 @@
+# param KICKSTART_SDCARDS=1
+# param BOOT_SDCARDS=1
+# param BOOT_CMDLINE="$BOOT_CMDLINE rdacct=1 rdlog=console rd-debug-udev=1 quiet panic=0 root=LABEL=ROOT"
+
+ignoredisk --drives=LABEL=SYSIMAGE
+clearpart --all --initlabel --disklabel=mbr
+
+part / --size=100% --fstype=f2fs --label=ROOT
+
+liveimg --url=dir:///sysimage/
+
+shutdown

testing/testing-altlinux-local

@@ -15,10 +15,6 @@ readonly KERNEL_FLAVOR=-latest
 
 TESTNAME="$1"; shift
 
-KICKSTART_DISKS=0
-BOOT_DISKS=0
-BOOT_CMDLINE=""
-
 eval $(sed -n -e 's/^# param //p' "$topdir/testing/$TESTNAME.cfg")
 
 readonly builddir=/srv
@@ -156,7 +152,7 @@ for step in "$@"; do
 			cat > /etc/initrd.mk <<EOF1
 			 AUTODETECT =
 			 DISABLE_FEATURES += ucode
-			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio
+			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio modules-blockdev
 			 MODULES_ADD += sd_mod
 			 MODULES_PRELOAD += virtio-blk virtio-scsi virtio-pci
 			 KICKSTART_CONFIGS = $builddir/$workdir/ks.cfg

testing/testing-altlinux-sshfs

@@ -17,8 +17,6 @@ MAKE_INITRD_PACKAGES+=" fuse-sshfs"
 
 TESTNAME="$1"; shift
 
-KICKSTART_DISKS=0
-BOOT_DISKS=0
 BOOT_CMDLINE="console=ttyS0,115200n8 fastboot rw"
 
 eval $(sed -n -e 's/^# param //p' "$topdir/testing/$TESTNAME.cfg")

testing/testing-fedora-local

@@ -15,10 +15,6 @@ readonly KERNEL_FLAVOR=
 
 TESTNAME="$1"; shift
 
-KICKSTART_DISKS=0
-BOOT_DISKS=0
-BOOT_CMDLINE=""
-
 eval $(sed -n -e 's/^# param //p' "$topdir/testing/$TESTNAME.cfg")
 
 readonly builddir=/srv
@@ -161,7 +157,7 @@ for step in "$@"; do
 			 AUTODETECT =
 			 IMAGEFILE = /boot/initrd-ks.img
 			 DISABLE_FEATURES += ucode
-			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio
+			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio modules-blockdev
 			 MODULES_ADD += sd_mod
 			 MODULES_PRELOAD += virtio-blk virtio-scsi virtio-pci
 			 KICKSTART_CONFIGS = $builddir/$workdir/ks.cfg

testing/testing-ubuntu-local

@@ -15,10 +15,6 @@ readonly KERNEL_FLAVOR=-generic
 
 TESTNAME="$1"; shift
 
-KICKSTART_DISKS=0
-BOOT_DISKS=0
-BOOT_CMDLINE=""
-
 eval $(sed -n -e 's/^# param //p' "$topdir/testing/$TESTNAME.cfg")
 
 readonly builddir=/srv
@@ -144,7 +140,7 @@ for step in "$@"; do
 			 AUTODETECT =
 			 IMAGEFILE = /boot/initrd-ks.img
 			 DISABLE_FEATURES += ucode
-			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio
+			 FEATURES = add-modules add-udev-rules kickstart qemu rdshell modules-virtio modules-blockdev
 			 MODULES_ADD += sd_mod
 			 MODULES_PRELOAD += virtio-blk virtio-scsi virtio-pci
 			 KICKSTART_CONFIGS = $builddir/$workdir/ks.cfg