ci/test: Pass bootloader as argument to Dockerfile

We want to install systemd boot and remove bootupd for systemd boot
images. Pass in a `bootloader` argument to the build Dockerfile

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

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -182,14 +182,28 @@ jobs:
         run: |
           BASE=$(just pullspec-for-os base ${{ matrix.test_os }})
           echo "BOOTC_base=${BASE}" >> $GITHUB_ENV
+          echo "RUST_BACKTRACE=full" >> $GITHUB_ENV
+          echo "RUST_LOG=trace" >> $GITHUB_ENV
 
           case "${{ matrix.variant }}" in
-            composefs-grub|composefs-sdboot)
+            composefs-grub)
               echo "BOOTC_variant=composefs" >> $GITHUB_ENV
+              echo "BOOTC_bootloader=grub" >> $GITHUB_ENV
             ;;
 
-            *)
+            composefs-sdboot)
+              echo "BOOTC_variant=composefs" >> $GITHUB_ENV
+              echo "BOOTC_bootloader=systemd" >> $GITHUB_ENV
+            ;;
+
+            composefs-sealeduki-sdboot)
+              echo "BOOTC_variant=${{ matrix.variant }}" >> $GITHUB_ENV
+              echo "BOOTC_bootloader=systemd" >> $GITHUB_ENV
+            ;;
+
+            ostree)
               echo "BOOTC_variant=${{ matrix.variant }}" >> $GITHUB_ENV
+              echo "BOOTC_bootloader=grub" >> $GITHUB_ENV
             ;;
           esac
 
@@ -208,7 +222,8 @@ jobs:
 
       - name: Build container
         run: |
-          BOOTC_SKIP_PACKAGE=1 just build
+          BOOTC_SKIP_PACKAGE=1 just bootloader=$BOOTC_bootloader build
+
           # Extra cross-check (duplicating the integration test) that we're using the right base
           used_vid=$(podman run --rm localhost/bootc bash -c '. /usr/lib/os-release && echo ${ID}-${VERSION_ID}')
           test ${{ matrix.test_os }} = "${used_vid}"

Dockerfile

@@ -144,12 +144,13 @@ RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp
 # Perform all filesystem transformations except generating the sealed UKI (if configured)
 FROM base as base-penultimate
 ARG variant
+ARG bootloader
 # Switch to a signed systemd-boot, if configured
 RUN --network=none --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp \
     --mount=type=bind,from=packaging,src=/,target=/run/packaging \
     --mount=type=bind,from=sdboot-signed,src=/,target=/run/sdboot-signed <<EORUN
 set -xeuo pipefail
-if test "${variant}" = "composefs-sealeduki-sdboot"; then
+if [[ "${bootloader}" == "systemd" ]]; then
   /run/packaging/switch-to-sdboot /run/sdboot-signed
 fi
 EORUN

Justfile

@@ -20,6 +20,7 @@ upgrade_img := base_img + "-upgrade"
 
 # Build variant: ostree (default) or composefs-sealeduki-sdboot (sealed UKI)
 variant := env("BOOTC_variant", "ostree")
+bootloader := env("BOOTC_bootloader", "grub")
 # Base container image to build from
 base := env("BOOTC_base", "quay.io/centos-bootc/centos-bootc:stream10")
 # Buildroot base image
@@ -38,7 +39,7 @@ lbi_images := "quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.a
 fedora-coreos := "quay.io/fedora/fedora-coreos:testing-devel"
 generic_buildargs := ""
 _extra_src_args := if extra_src != "" { "-v " + extra_src + ":/run/extra-src:ro --security-opt=label=disable" } else { "" }
-base_buildargs := generic_buildargs + " " + _extra_src_args + " --build-arg=base=" + base + " --build-arg=variant=" + variant
+base_buildargs := generic_buildargs + " " + _extra_src_args + " --build-arg=base=" + base + " --build-arg=variant=" + variant + " --build-arg=bootloader=" + bootloader
 buildargs := base_buildargs \
              + " --cap-add=all --security-opt=label=type:container_runtime_t --device /dev/fuse" \
              + " --secret=id=secureboot_key,src=target/test-secureboot/db.key --secret=id=secureboot_cert,src=target/test-secureboot/db.crt"
@@ -110,7 +111,8 @@ test-composefs-sealeduki-sdboot:
 
 [group('core')]
 test-composefs bootloader:
-    just variant=composefs test-tmt --composefs-backend --bootloader {{bootloader}} \
+    just variant=composefs bootloader={{bootloader}} \
+        test-tmt --composefs-backend --bootloader {{bootloader}} \
         readonly \
         bib-build \
         download-only \

tmt/tests/booted/test-image-pushpull-upgrade.nu

@@ -54,7 +54,7 @@ RUN echo test content > /usr/share/blah.txt
     let v = podman run --rm localhost/bootc-derived cat /usr/share/blah.txt | str trim
     assert equal $v "test content"
 
-    mut orig_root_mtime = null;
+    mut orig_root_mtime = 0;
 
     if not $is_composefs {
         $orig_root_mtime = ls -Dl /ostree/bootc | get modified