.github/workflows/ci.yaml

@@ -200,6 +200,31 @@ jobs:
         run: tar -C / -xzvf install.tar
       - name: Integration tests
         run: env TMPDIR=/var/tmp JOBS=3 ./tests/compose-image.sh
+  compose-rootfs:
+    name: "compose-rootfs tests"
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      # https://github.com/containers/podman/discussions/17362
+      - name: Get a newer podman for heredoc support (from debian testing)
+        run: |
+          set -eux
+          echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
+          sudo apt update
+          sudo apt install -y crun/testing podman/testing skopeo/testing
+          # Something is confused in latest GHA here
+          sudo rm /var/lib/containers -rf
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Download build
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: install.tar
+      - name: Test compose-rootfs
+        run: |
+          cd tests/compose-rootfs
+          tar -xzvf ../../install.tar
+          sudo podman build -v $(pwd)/usr/bin/rpm-ostree:/run/build/rpm-ostree:ro --security-opt=label=disable --cap-add=all --device /dev/fuse -t localhost/test -f Containerfile .
   container-encapsulate:
     name: "Encapsulate tests"
     needs: build
@@ -230,17 +255,27 @@ jobs:
           echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
           sudo apt update
           sudo apt install -y crun/testing podman/testing skopeo/testing
-          crun --version
-          podman --version
-          skopeo --version
+          # Something is confused in latest GHA here
+          sudo rm /var/lib/containers -rf
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Download build
         uses: actions/download-artifact@v4.1.7
         with:
           name: install-c9s.tar
       - name: Integration tests
-        run: cd tests/build-chunked-oci && tar -xzvf ../../install.tar && podman build -v $(pwd)/usr/bin:/ci -t localhost/test .
+        run: |
+          set -xeuo pipefail
+          cd tests/build-chunked-oci
+          sudo podman build -t localhost/base -f Containerfile.test
+          sudo tar -xzvf ../../install.tar
+          sudo podman build -v $(pwd)/usr/bin:/ci -t localhost/builder -f Containerfile.builder
+          sudo podman run --rm --privileged --security-opt=label=disable \
+            -v /var/lib/containers:/var/lib/containers \
+            -v /var/tmp:/var/tmp \
+            -v $(pwd):/output \
+            localhost/builder rpm-ostree experimental compose build-chunked-oci --bootc --format-version=1 --from localhost/base --output oci:/output/base-chunked
+          sudo skopeo inspect oci:base-chunked
   build-c9s:
     name: "Build (c9s)"
     runs-on: ubuntu-latest