ci: Unify more of hack/ and tests/

cgwalters · cgwalters · commit 7eab41eb860b · 2025-09-15T18:21:55.000-04:00
A key thing for me is that the `Justfile` should be a one-stop shop for development of the project. It can't have everything but it should answer the basic questions of "how do I build and test this project". This aligns the recently added tmt-on-GHA flow a *bit* more closely with some of that. Biggest is to use the `just build-integration-test-image` as the canonical way to build a container image with our testing stuff in it; which uses our main Dockerfile Other cleanups: - Change test script to move into tests/tmt/ as a workaround for teemtee/tmt#3037 (comment) - Change the qemu logic to use SMBIOS credentials so we don't have to carry around both a disk image and a SSH key - Change qemu to use `-snapshot` so we can reuse disks - Change the scripts to accept data via argv[1] and not environment - Drop the hardcoded testing directory and use `target/` as a generic build artifact dir Signed-off-by: Colin Walters <walters@verbum.org>
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -1,14 +1,16 @@
 name: bootc integration test
 on:
   pull_request:
-    branches: [main]
+    branches: [main]  
+  workflow_dispatch:
 
 jobs:
   build:
     strategy:
       matrix:
-        test_os: [fedora-41, fedora-42, fedora-43, centos-9]
-        test_runner: [ubuntu-latest, ubuntu-24.04-arm]
+        #test_os: [fedora-42, fedora-43, centos-9, centos-10]
+        test_os: [centos-10]
+        test_runner: [ubuntu-24.04, ubuntu-24.04-arm]
 
     runs-on: ${{ matrix.test_runner }}
 
@@ -18,67 +20,56 @@ jobs:
           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
+          sudo apt install -y crun/testing podman/testing just
 
       - uses: actions/checkout@v4
 
-      - name: Build bootc and bootc image
-        env:
-          TEST_OS: ${{ matrix.test_os }}
-        run: sudo -E TEST_OS=$TEST_OS tests/build.sh
+      - name: Set architecture variable
+        id: set_arch
+        run: echo "ARCH=$(arch)" >> $GITHUB_ENV
 
-      - name: Grant sudo user permission to archive files
+      - name: Build bootc and bootc image
         run: |
-          sudo chmod 0755 /tmp/tmp-bootc-build/id_rsa
+          sudo tests/build.sh ${{ matrix.test_os }}
 
       - name: Archive bootc disk image - disk.raw
-        if: matrix.test_runner == 'ubuntu-latest'
-        uses: actions/upload-artifact@v4
-        with:
-          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-disk
-          path: /tmp/tmp-bootc-build/disk.raw
-          retention-days: 1
-
-      - name: Archive SSH private key - id_rsa
-        if: matrix.test_runner == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-id_rsa
-          path: /tmp/tmp-bootc-build/id_rsa
+          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ env.ARCH }}-disk
+          path: target/disk.raw
           retention-days: 1
 
   test:
     needs: build
     strategy:
       matrix:
-        test_os: [fedora-41, fedora-42, fedora-43, centos-9]
+        #test_os: [fedora-42, fedora-43, centos-9, centos-10]
+        test_os: [centos-10]
         tmt_plan: [test-01-readonly, test-20-local-upgrade, test-21-logically-bound-switch, test-22-logically-bound-install, test-23-install-outside-container, test-24-local-upgrade-reboot]
 
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install dependence
+      - name: Set architecture variable
+        id: set_arch
+        run: echo "ARCH=$(arch)" >> $GITHUB_ENV
+
+      - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt install -y qemu-kvm qemu-system
+          sudo apt install -y qemu-kvm qemu-system just
           pip install --user tmt
 
       - name: Create folder to save disk image
-        run: mkdir -p /tmp/tmp-bootc-build
+        run: mkdir -p target
 
       - name: Download disk.raw
         uses: actions/download-artifact@v4
         with:
-          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-disk
-          path: /tmp/tmp-bootc-build
-
-      - name: Download id_rsa
-        uses: actions/download-artifact@v4
-        with:
-          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-id_rsa
-          path: /tmp/tmp-bootc-build
+          name: PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ env.ARCH }}-disk
+          path: target
 
       - name: Enable KVM group perms
         run: |
@@ -88,13 +79,13 @@ jobs:
           ls -l /dev/kvm
 
       - name: Run test
-        env:
-          TMT_PLAN_NAME: ${{ matrix.tmt_plan }}
-        run: chmod 600 /tmp/tmp-bootc-build/id_rsa && tests/test.sh
+        run: |
+          ls -al target
+          tests/test.sh ${{ matrix.tmt_plan }}
 
       - name: Archive TMT logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ matrix.tmt_plan }}
+          name: tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ env.ARCH }}-${{ matrix.tmt_plan }}
           path: /var/tmp/tmt
diff --git a/.packit.yaml b/.packit.yaml
@@ -59,24 +59,26 @@ jobs:
     owner: rhcontainerbot
     project: bootc
     enable_net: true
+    # TODO
     notifications:
       failure_comment:
         message: "bootc Copr build failed for {commit_sha}. @admin check logs {logs_url} and packit dashboard {packit_dashboard_url}"
 
-  - job: tests
-    trigger: pull_request
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
-      - fedora-42-x86_64
-      - fedora-42-aarch64
-      - fedora-rawhide-x86_64
-      - fedora-rawhide-aarch64
-    tmt_plan: /integration
-    skip_build: true
-    identifier: integration-test
+  # TODO: Readd some tmt tests that install the built RPM and e.g. test out system-reinstall-bootc
+  # - job: tests
+  #   trigger: pull_request
+  #   targets:
+  #     - centos-stream-9-x86_64
+  #     - centos-stream-9-aarch64
+  #     - centos-stream-10-x86_64
+  #     - centos-stream-10-aarch64
+  #     - fedora-42-x86_64
+  #     - fedora-42-aarch64
+  #     - fedora-rawhide-x86_64
+  #     - fedora-rawhide-aarch64
+  #   tmt_plan: /integration
+  #   skip_build: true
+  #   identifier: integration-test
 
   - job: propose_downstream
     trigger: release
diff --git a/Justfile b/Justfile
@@ -5,6 +5,10 @@ build *ARGS:
 # This container image has additional testing content and utilities
 build-integration-test-image *ARGS: build
     podman build --jobs=4 -t localhost/bootc-integration -f hack/Containerfile {{ARGS}} .
+    # Keep these in sync with what's used in hack/lbi
+    podman pull --retry 5 --retry-delay 5s quay.io/curl/curl:latest
+    podman pull --retry 5 --retry-delay 5s quay.io/curl/curl-base:latest
+    podman pull --retry 5 --retry-delay 5s registry.access.redhat.com/ubi9/podman:latest
 
 # Run container integration tests
 run-container-integration: build-integration-test-image
diff --git a/hack/Containerfile b/hack/Containerfile
@@ -1,4 +1,7 @@
-# This injects some extra testing stuff into our image
+# Build a container image that has extra testing stuff in it, such
+# as nushell, some preset logically bound images, etc. This expects
+# to create an image derived FROM localhost/bootc which was created
+# by the Dockerfile at top.
 
 FROM scratch as context
 # We only need this stuff in the initial context
@@ -11,7 +14,15 @@ ARG variant=
 # And this layer has additional stuff for testing, such as nushell etc.
 RUN --mount=type=bind,from=context,target=/run/context <<EORUN
 set -xeuo pipefail
-/run/context/hack/provision-derived.sh "$variant"
+cd /run/context/hack
+./provision-derived.sh "$variant"
+
+# For test-22-logically-bound-install
+cp -a lbi/usr/. /usr
+for x in curl.container curl-base.image podman.image; do
+    ln -s /usr/share/containers/systemd/$x /usr/lib/bootc/bound-images.d/$x
+done
+
 # Add some testing kargs into our dev builds
 install -D -t /usr/lib/bootc/kargs.d /run/context/hack/test-kargs/*
 # Also copy in some default install configs we use for testing
diff --git a/hack/lbi/usr/share/containers/systemd/curl-base.image b/hack/lbi/usr/share/containers/systemd/curl-base.image
@@ -0,0 +1,2 @@
+[Image]
+Image=quay.io/curl/curl-base:latest
diff --git a/hack/lbi/usr/share/containers/systemd/curl.container b/hack/lbi/usr/share/containers/systemd/curl.container
@@ -0,0 +1,3 @@
+[Container]
+Image=quay.io/curl/curl:latest
+GlobalArgs=--storage-opt=additionalimagestore=/usr/lib/bootc/storage
diff --git a/hack/lbi/usr/share/containers/systemd/jboss-webserver-5.image b/hack/lbi/usr/share/containers/systemd/jboss-webserver-5.image
@@ -0,0 +1,6 @@
+# This is not symlinked to bound-images.d so it should not be pulled.
+# It's here to represent an app image that exists
+# in a bootc image but is not logically bound.
+[Image]
+Image=registry.redhat.io/jboss-webserver-5/jws5-rhel8-operator:latest
+AuthFile=/root/auth.json
diff --git a/hack/lbi/usr/share/containers/systemd/podman.image b/hack/lbi/usr/share/containers/systemd/podman.image
@@ -0,0 +1,2 @@
+[Image]
+Image=registry.access.redhat.com/ubi9/podman:latest
diff --git a/hack/packages.txt b/hack/packages.txt
@@ -0,0 +1,4 @@
+# Needed by tmt
+rsync
+/usr/bin/flock
+/usr/bin/awk
diff --git a/hack/provision-derived.sh b/hack/provision-derived.sh
@@ -16,12 +16,10 @@ case "${ID}-${VERSION_ID}" in
         dnf config-manager --set-enabled crb
         dnf -y install epel-release epel-next-release
         dnf -y install nu
-        dnf clean all
         ;;
     "rhel-9."*)
         dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
         dnf -y install nu
-        dnf clean all
         ;;
     "centos-10"|"rhel-10."*)
         # nu is not available in CS10
@@ -32,10 +30,13 @@ case "${ID}-${VERSION_ID}" in
         ;;
     "fedora-"*)
         dnf -y install nu
-        dnf clean all
         ;;
 esac
 
+# Extra packages we install
+grep -Ev -e '^#' packages.txt | xargs dnf -y install
+dnf clean all
+
 # Stock extra cleaning of logs and caches in general (mostly dnf)
 rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf
 # And clean root's homedir
diff --git a/tests/build.sh b/tests/build.sh
diff --git a/tests/test.sh b/tests/test.sh
diff --git a/tmt/plans/bootc-integration.fmf b/tmt/plans/bootc-integration.fmf
diff --git a/tmt/plans/integration.fmf b/tmt/plans/integration.fmf

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[Image]`
	`2`	`+Image=quay.io/curl/curl-base:latest`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[Container]`
	`2`	`+Image=quay.io/curl/curl:latest`
	`3`	`+GlobalArgs=--storage-opt=additionalimagestore=/usr/lib/bootc/storage`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[Image]`
	`2`	`+Image=registry.access.redhat.com/ubi9/podman:latest`