justfile/ci: Add composefs tests

Add tests for composefs backend for grub and sdboot. Update the testing
matrix in CI

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -157,7 +157,7 @@ jobs:
       matrix:
         # No fedora-44 due to https://bugzilla.redhat.com/show_bug.cgi?id=2429501
         test_os: [fedora-43, centos-9, centos-10]
-        variant: [ostree, composefs-sealeduki-sdboot]
+        variant: [ostree, composefs-sealeduki-sdboot, composefs-sdboot, composefs-grub]
         exclude:
           # centos-9 UKI is experimental/broken (https://github.com/bootc-dev/bootc/issues/1812)
           - test_os: centos-9
@@ -178,7 +178,18 @@ jobs:
         run: |
           BASE=$(just pullspec-for-os base ${{ matrix.test_os }})
           echo "BOOTC_base=${BASE}" >> $GITHUB_ENV
-          echo "BOOTC_variant=${{ matrix.variant }}" >> $GITHUB_ENV
+
+          case "${{ matrix.variant }}" in
+            composefs-grub|composefs-sdboot)
+              echo "BOOTC_variant=composefs" >> $GITHUB_ENV
+            ;;
+
+            *)
+              echo "BOOTC_variant=${{ matrix.variant }}" >> $GITHUB_ENV
+            ;;
+          esac
+
+
 
           if [ "${{ matrix.variant }}" = "composefs-sealeduki-sdboot" ]; then
             BUILDROOTBASE=$(just pullspec-for-os buildroot-base ${{ matrix.test_os }})
@@ -207,11 +218,12 @@ jobs:
 
       - name: Run TMT integration tests
         run: |
-          if [ "${{ matrix.variant }}" = "composefs-sealeduki-sdboot" ]; then
-            just test-composefs
+          if [[ "${{ matrix.variant }}" = composefs* ]]; then
+            just "test-${{ matrix.variant }}"
           else
             just test-tmt integration
           fi
+
           just clean-local-images
 
       - name: Archive TMT logs

Justfile

@@ -105,9 +105,32 @@ test-container: build build-units
 
 # Build and test sealed composefs images
 [group('core')]
-test-composefs:
+test-composefs-sealeduki-sdboot:
     just variant=composefs-sealeduki-sdboot test-tmt readonly local-upgrade-reboot
 
+[group('core')]
+test-composefs bootloader:
+    just variant=composefs test-tmt --composefs-backend --bootloader {{bootloader}} \
+        readonly \
+        bib-build \
+        download-only \
+        image-pushpull-upgrade \
+        image-upgrade-reboot \
+        install-outside-container \
+        install-to-filesystem-var-mount \
+        soft-reboot \
+        usroverlay
+
+# Build and test composefs images booted using Type1 boot entries and systemd-boot as the bootloader
+[group('core')]
+test-composefs-sdboot:
+    just test-composefs systemd
+
+# Build and test composefs images booted using Type1 boot entries and grub as the bootloader
+[group('core')]
+test-composefs-grub:
+    just test-composefs grub
+
 # Run cargo fmt and clippy checks in container
 [group('core')]
 validate:
@@ -220,6 +243,7 @@ clean-local-images:
     podman image prune -f
     podman rmi {{fedora-coreos}} -f
 
+
 # Build packages (RPM) into target/packages/
 [group('maintenance')]
 package: