tests: Update tests for GrubCC

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

No secureboot for grub-cc

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

Author: Johan-Liebert1

crates/lib/src/spec.rs

@@ -238,14 +238,15 @@ pub enum Bootloader {
     #[default]
     Grub,
     /// Use Grub for confidential clusters as the bootloader
+    #[serde(rename = "grub-cc")]
     GrubCC,
     /// Use SystemdBoot as the bootloader
     Systemd,
     /// Don't use a bootloader managed by bootc
     None,
 }
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum BootloaderKind {
     /// Bootloader that support Bootloader Specification
     /// GrubCC and SystemdBoot

crates/xtask/src/bcvk.rs

@@ -110,7 +110,10 @@ impl BcvkInstallOpts {
                      Run 'just generate-secureboot-keys' to generate them."
                 );
             }
-        } else if matches!(self.bootloader, Some(Bootloader::Systemd)) {
+        } else if matches!(
+            self.bootloader,
+            Some(Bootloader::Systemd) | Some(Bootloader::GrubCC)
+        ) {
             Ok(vec!["--firmware=uefi-insecure".into()])
         } else {
             Ok(Vec::new())

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

@@ -7,6 +7,12 @@ def parse_cmdline []  {
     open /proc/cmdline | str trim | split row " "
 }
 
+def find_root_eq_in_cmdline [bootloader: string] {
+    let cmdline = parse_cmdline
+    let has_root_param = ($cmdline | any { |param| $param | str starts-with 'root=' })
+    assert (not $has_root_param) $"($bootloader) image should not have root= in kernel cmdline; systemd-gpt-auto-generator should discover the root partition via DPS"
+}
+
 # Detect composefs by checking if composefs field is present
 let st = bootc status --json | from json
 let is_composefs = (tap is_composefs)
@@ -24,11 +30,14 @@ if $expecting_composefs {
         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"
+            find_root_eq_in_cmdline "systemd-boot"
         }
     }
+
+    # GrubCC also supports BLS and shouldn't need root=
+    if $bootloader == "grub-cc" {
+        find_root_eq_in_cmdline "grub-cc"
+    }
 }
 
 if $is_composefs {

tmt/tests/booted/test-composefs-gc.nu

@@ -88,9 +88,9 @@ def third_boot [] {
     # Also assert we have two different kernel + initrd pairs
     let booted_verity = (bootc status --json | from json).status.booted.composefs.verity
 
-    let bootloader = (bootc status --json | from json).status.booted.composefs.bootloader
+    let bootloader = ((bootc status --json | from json).status.booted.composefs.bootloader | str downcase)
 
-    let boot_dir = if ($bootloader | str downcase) == "systemd" {
+    let boot_dir = if $bootloader == "systemd" or $bootloader == "grub-cc" {
         # TODO: Some concrete API for this would be great
         mkdir /var/tmp/efi
         mount /dev/disk/by-partlabel/EFI-SYSTEM /var/tmp/efi
@@ -123,9 +123,9 @@ def third_boot [] {
 }
 
 def fourth_boot [] {
-    let bootloader = (bootc status --json | from json).status.booted.composefs.bootloader
+    let bootloader = ((bootc status --json | from json).status.booted.composefs.bootloader | str downcase)
 
-    if ($bootloader | str downcase) == "systemd" {
+    if $bootloader == "systemd" or $bootloader == "grub-cc" {
         # TODO: Some concrete API for this would be great
         mkdir /var/tmp/efi
         mount /dev/disk/by-partlabel/EFI-SYSTEM /var/tmp/efi

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

@@ -141,11 +141,15 @@ echo "Filesystem layout:"
 mount | grep /var/mnt/target || true
 df -h /var/mnt/target /var/mnt/target/boot /var/mnt/target/boot/efi /var/mnt/target/var
 
-COMPOSEFS_BACKEND=()
+bootloader=$(bootc status --json | jq -r '.status.booted.composefs.bootloader' | tr '[:upper:]' '[:lower:]')
+
+COMPOSEFS_BACKEND_PARAMS=()
 KARGS=("--karg=root=UUID=$ROOT_UUID")
 
 if [[ $is_composefs != "null" ]]; then
-    COMPOSEFS_BACKEND+=("--composefs-backend")
+    COMPOSEFS_BACKEND_PARAMS+=("--composefs-backend")
+    COMPOSEFS_BACKEND_PARAMS+=("--bootloader" "${bootloader}")
+
     tune2fs -O verity /dev/BL/var02
     tune2fs -O verity /dev/BL/root02
 
@@ -164,7 +168,7 @@ podman run \
     "$TARGET_IMAGE" \
     bootc install to-filesystem \
         --disable-selinux \
-        "${COMPOSEFS_BACKEND[@]}" \
+        "${COMPOSEFS_BACKEND_PARAMS[@]}" \
         "${KARGS[@]}" \
         --root-mount-spec=UUID="$ROOT_UUID" \
         --boot-mount-spec=UUID="$BOOT_UUID" \
@@ -186,16 +190,12 @@ else
     # 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
     else
         test -d /var/mnt/target/boot/efi/EFI
         test -d /var/mnt/target/boot/efi/loader/entries
     fi
-
 fi
 
 

tmt/tests/booted/test-multi-device-esp.nu

@@ -437,8 +437,9 @@ def main [] {
     # supports GRUB today.  Skip when the image uses systemd-boot.
     if (tap is_composefs) {
         let st = bootc status --json | from json
-        if ($st.status.booted.composefs.bootloader | str downcase) == "systemd" {
-            print "SKIP: multi-device ESP test not supported with systemd-boot"
+        let bootloader = $st.status.booted.composefs.bootloader | str downcase
+        if $bootloader == "systemd" or $bootloader == "grub-cc" {
+            print $"SKIP: multi-device ESP test not supported with ($bootloader)"
             tap ok
             return
         }