tests: Fix container tests, update CI matrix

Remove "composefs-sealeduki-sdboot" variant

Only exclude ext4-unsealed-uki as we still want to run tests on unsealed
bls ext4 systems

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

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -180,6 +180,7 @@ jobs:
             filesystem: xfs
           - seal_state: "unsealed"
             filesystem: ext4
+            boot_type: uki # we still want to test ext4 unsealed bls
           - bootloader: grub
             boot_type: "uki"
 

Justfile

@@ -114,7 +114,7 @@ test-tmt *ARGS: build
 [group('core')]
 test-container: build build-units
     podman run --rm --read-only localhost/bootc-units /usr/bin/bootc-units
-    podman run --rm --env=BOOTC_variant={{variant}} --env=BOOTC_base={{base}} {{base_img}} bootc-integration-tests container
+    podman run --rm --env=BOOTC_variant={{variant}} --env=BOOTC_base={{base}} --env=BOOTC_boot_type={{boot_type}} {{base_img}} bootc-integration-tests container
 
 [group('core')]
 test-composefs bootloader filesystem boot_type seal_state:
@@ -133,7 +133,7 @@ test-composefs bootloader filesystem boot_type seal_state:
         filesystem={{filesystem}} \
         boot_type={{boot_type}} \
         seal_state={{seal_state}} \
-            test-tmt-nobuild --composefs-backend \
+            test-tmt --composefs-backend \
                 --bootloader={{bootloader}} \
                 --filesystem={{filesystem}} \
                 --seal-state={{seal_state}} \

crates/tests-integration/src/container.rs

@@ -50,17 +50,20 @@ pub(crate) fn test_bootc_container_inspect() -> Result<()> {
         .expect("kernel.unified should be present")
         .as_bool()
         .expect("kernel.unified should be a boolean");
+
+    let is_uki = std::env::var("BOOTC_boot_type").is_ok_and(|var| var == "uki");
+
     if let Some(variant) = std::env::var("BOOTC_variant").ok() {
-        match variant.as_str() {
-            v @ "ostree" | v @ "composefs" => {
+        match (variant.as_str(), is_uki) {
+            (v @ "ostree", _) | (v @ "composefs", false) => {
                 assert!(!unified, "Expected unified=false for variant {v}");
                 // For traditional kernels, version should look like a uname (contains digits)
                 assert!(
                     version.chars().any(|c| c.is_ascii_digit()),
                     "version should contain version numbers for traditional kernel: {version}"
                 );
             }
-            "composefs-sealeduki-sdboot" => {
+            ("composefs", true) => {
                 assert!(unified, "Expected unified=true for UKI variant");
                 // For UKI, version is the filename without .efi extension (should not end with .efi)
                 assert!(
@@ -70,7 +73,7 @@ pub(crate) fn test_bootc_container_inspect() -> Result<()> {
                 // Version should be non-empty after stripping extension
                 assert!(!version.is_empty(), "version should not be empty for UKI");
             }
-            o => eprintln!("notice: Unhandled variant for kernel check: {o}"),
+            o => eprintln!("notice: Unhandled variant for kernel check: {o:?}"),
         }
     }
 
@@ -155,17 +158,19 @@ fn test_system_reinstall_help() -> Result<()> {
 /// Verify that the values of `variant` and `base` from Justfile actually applied
 /// to this container image.
 fn test_variant_base_crosscheck() -> Result<()> {
+    let is_uki = std::env::var("BOOTC_boot_type").is_ok_and(|var| var == "uki");
+
     if let Some(variant) = std::env::var("BOOTC_variant").ok() {
         // TODO add this to `bootc status` or so?
         let boot_efi = Utf8Path::new("/boot/EFI");
-        match variant.as_str() {
-            "composefs" | "ostree" => {
+        match (variant.as_str(), is_uki) {
+            ("composefs", false) | ("ostree", _) => {
                 assert!(!boot_efi.try_exists()?);
             }
-            "composefs-sealeduki-sdboot" => {
+            ("composefs", true) => {
                 assert!(boot_efi.try_exists()?);
             }
-            o => panic!("Unhandled variant: {o}"),
+            o => panic!("Unhandled variant: {o:?}"),
         }
     }
     if let Some(base) = std::env::var("BOOTC_base").ok() {