Make tests work for sdboot

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

Justfile

@@ -114,7 +114,6 @@ test-composefs bootloader:
     just variant=composefs bootloader={{bootloader}} \
         test-tmt --composefs-backend --bootloader {{bootloader}} \
         readonly \
-        bib-build \
         download-only \
         image-pushpull-upgrade \
         image-upgrade-reboot \

tmt/tests/booted/readonly/030-test-composefs.nu

@@ -13,15 +13,21 @@ let is_composefs = (tap is_composefs)
 let expecting_composefs = ($env.BOOTC_variant? | default "" | find "composefs") != null
 if $expecting_composefs {
     assert $is_composefs
-    # When using systemd-boot with DPS (Discoverable Partition Specification),
-    # /proc/cmdline should NOT contain a root= parameter because systemd-gpt-auto-generator
-    # discovers the root partition automatically
-    # Note that there is `bootctl --json=pretty` but it doesn't actually output JSON
-    let bootctl_output = (bootctl)
-    if ($bootctl_output | str contains 'Product: systemd-boot') {
-        let cmdline = parse_cmdline
-        let has_root_param = ($cmdline | any { |param| $param | str starts-with 'root=' })
-        assert (not $has_root_param) "systemd-boot image should not have root= in kernel cmdline; systemd-gpt-auto-generator should discover the root partition via DPS"
+
+    let bootloader = ($st.status.booted.composefs.bootloader | str downcase)
+
+    if $bootloader == "systemd" {
+        # When using systemd-boot with DPS (Discoverable Partition Specification),
+        # /proc/cmdline should NOT contain a root= parameter because systemd-gpt-auto-generator
+        # discovers the root partition automatically
+        # Note that there is `bootctl --json=pretty` but it doesn't actually output JSON
+        let bootctl_output = (bootctl)
+
+        if ($bootctl_output | str contains 'Product: systemd-boot') {
+            let cmdline = parse_cmdline
+            let has_root_param = ($cmdline | any { |param| $param | str starts-with 'root=' })
+            assert (not $has_root_param) "systemd-boot image should not have root= in kernel cmdline; systemd-gpt-auto-generator should discover the root partition via DPS"
+        }
     }
 }
 

tmt/tests/booted/test-install-outside-container.nu

@@ -28,6 +28,16 @@ umount /var/mnt
 # so we mask off /sysroot/ostree
 # And using systemd-run here breaks our install_t so we disable SELinux enforcement
 setenforce 0
+
+let st = bootc status --json | from json
+let bootloader = ($st.status.booted.composefs.bootloader | str downcase)
+
+let install_cmd = if (tap is_composefs) {
+    $"bootc install to-disk --disable-selinux --via-loopback --composefs-backend --bootloader=($bootloader) --filesystem ext4 --source-imgref ($target_image) ./disk.img"
+} else {
+    $"bootc install to-disk --disable-selinux --via-loopback --filesystem xfs --source-imgref ($target_image) ./disk.img"
+}
+
 systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $"
 set -xeuo pipefail
 bootc usr-overlay
@@ -36,7 +46,7 @@ if test -d /sysroot/ostree; then mount --bind /usr/share/empty /sysroot/ostree;
 rm -vrf /usr/lib/bootupd/updates
 # Another bootc install bug, we should not look at this in outside-of-container flows
 rm -vrf /usr/lib/bootc/bound-images.d
-bootc install to-disk --disable-selinux --via-loopback --filesystem xfs --source-imgref ($target_image) ./disk.img
+($install_cmd)
 "
 
 tap ok

tmt/tests/booted/test-install-to-filesystem-var-mount.sh

@@ -56,13 +56,13 @@ parted -s "$LOOP_DEV" mklabel gpt
 # BIOS boot partition (for GRUB on GPT)
 parted -s "$LOOP_DEV" mkpart primary 1MiB 2MiB
 parted -s "$LOOP_DEV" set 1 bios_grub on
-# EFI partition (200 MiB)
-parted -s "$LOOP_DEV" mkpart primary fat32 2MiB 202MiB
+# EFI partition (1 GiB)
+parted -s "$LOOP_DEV" mkpart primary fat32 2MiB 1026MiB
 parted -s "$LOOP_DEV" set 2 esp on
 # Boot partition (1 GiB)
-parted -s "$LOOP_DEV" mkpart primary ext4 202MiB 1226MiB
+parted -s "$LOOP_DEV" mkpart primary ext4 1026MiB 2052MiB
 # LVM partition (rest of disk)
-parted -s "$LOOP_DEV" mkpart primary 1226MiB 100%
+parted -s "$LOOP_DEV" mkpart primary 2052MiB 100%
 
 # Reload partition table
 partprobe "$LOOP_DEV"
@@ -153,9 +153,13 @@ if [[ $is_composefs == "null" ]]; then
     test -d /var/mnt/target/boot/grub2 || test -d /var/mnt/target/boot/loader
 else 
     test -d /var/mnt/target/composefs
-    ls -lahR /var/mnt/target/boot
 
+    # TODO(Johan-Liebert1): This is getting bootloader from the VM, which is not quite correct
+    # It works for now as the CI runs separately for each bootloader, but we need to get the 
+    # bootloader from the installed systemd if we wish to run the tests locally without rebuilding the images
+    # This probably also happens in other tests, one instance is install-outside-container
     bootloader=$(bootc status --json | jq '.status.booted.composefs.bootloader' | tr '[:upper:]' '[:lower:]')
+    bootloader=${bootloader//\"/}
 
     if [[ $bootloader == "grub" ]]; then
         test -d /var/mnt/target/boot/grub2 || test -d /var/mnt/target/boot/loader