More unification of tmt flow

Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

.github/workflows/ci.yml

@@ -56,7 +56,9 @@ jobs:
         run: sudo apt update && sudo apt install just
       - uses: actions/checkout@v4
       - name: Build and run container integration tests
-        run: sudo just run-container-integration run-container-external-tests
+        run: |
+          sudo just build
+          sudo just run-container-integration run-container-external-tests
   container-continuous:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
     runs-on: ubuntu-24.04
@@ -105,6 +107,7 @@ jobs:
           set -xeu
           # Build images to test; TODO investigate doing single container builds
           # via GHA and pushing to a temporary registry to share among workflows?
+          sudo just build
           sudo just build-integration-test-image
           sudo podman build -t localhost/bootc-fsverity -f ci/Containerfile.install-fsverity
 

.github/workflows/integration.yml

@@ -4,44 +4,50 @@ on:
     branches: [main]  
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         #test_os: [fedora-42, fedora-43, centos-9, centos-10]
         test_os: [centos-10]
-        test_runner: [ubuntu-24.04, ubuntu-24.04-arm]
+        test_runner: [ubuntu-24.04]
 
     runs-on: ${{ matrix.test_runner }}
 
     steps:
-      - name: Install podman for heredoc support
+      - name: Install dependencies
         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 just
+          sudo apt install -y crun/testing podman/testing just qemu-utils
 
       - uses: actions/checkout@v4
 
       - name: Set architecture variable
         id: set_arch
         run: echo "ARCH=$(arch)" >> $GITHUB_ENV
 
-      - name: Build bootc and bootc image
+      - name: Build container and disk image
         run: |
           sudo tests/build.sh ${{ matrix.test_os }}
 
-      - name: Archive bootc disk image - disk.raw
+      - name: Archive disk image
         uses: actions/upload-artifact@v4
         with:
           name: PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ env.ARCH }}-disk
-          path: target/disk.raw
+          path: target/bootc-integration-test.qcow2
           retention-days: 1
 
   test:
     needs: build
     strategy:
+      fail-fast: false
       matrix:
         #test_os: [fedora-42, fedora-43, centos-9, centos-10]
         test_os: [centos-10]
@@ -59,7 +65,7 @@ jobs:
       - name: Install deps
         run: |
           sudo apt-get update
-          sudo apt install -y qemu-kvm qemu-system just
+          sudo apt install -y qemu-kvm qemu-system qemu-utils just
           pip install --user tmt
 
       - name: Create folder to save disk image
@@ -78,6 +84,9 @@ jobs:
           sudo udevadm trigger --name-match=kvm
           ls -l /dev/kvm
 
+      - name: Workaround https://github.com/teemtee/testcloud/issues/18
+        run: sudo rm -f /usr/bin/chcon && sudo ln -sr /usr/bin/true /usr/bin/chcon
+
       - name: Run test
         run: |
           ls -al target

Justfile

@@ -3,12 +3,10 @@ build *ARGS:
     podman build --jobs=4 -t localhost/bootc {{ARGS}} .
 
 # This container image has additional testing content and utilities
-build-integration-test-image *ARGS: build
+build-integration-test-image *ARGS:
     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
+    podman pull -q --retry 5 --retry-delay 5s quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest
 
 # Run container integration tests
 run-container-integration: build-integration-test-image

hack/packages.txt

@@ -1,4 +1,5 @@
 # Needed by tmt
 rsync
+cloud-init
 /usr/bin/flock
 /usr/bin/awk

hack/provision-derived.sh

@@ -23,10 +23,14 @@ case "${ID}-${VERSION_ID}" in
         ;;
     "centos-10"|"rhel-10."*)
         # nu is not available in CS10
+        td=$(mktemp -d)
+        cd $td
         curl -kL "https://github.com/nushell/nushell/releases/download/0.103.0/nu-0.103.0-$(uname -m)-unknown-linux-gnu.tar.gz" --output nu.tar.gz
         mkdir -p nu && tar zvxf nu.tar.gz --strip-components=1 -C nu
         mv nu/nu /usr/bin/nu
         rm -rf nu nu.tar.gz
+        cd -
+        rm -rf "${td}"
         ;;
     "fedora-"*)
         dnf -y install nu
@@ -37,10 +41,20 @@ esac
 grep -Ev -e '^#' packages.txt | xargs dnf -y install
 dnf clean all
 
+# Cloud bits
+cat <<KARGEOF >> /usr/lib/bootc/kargs.d/20-console.toml
+kargs = ["console=ttyS0,115200n8"]
+KARGEOF
+# And cloud-init stuff
+ln -s ../cloud-init.target /usr/lib/systemd/system/default.target.wants
+
 # 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
 rm /var/roothome/.config -rf
+cat >/usr/lib/tmpfiles.d/bootc-cloud-init.conf <<'EOF'
+d /var/lib/cloud 0755 root root - -
+EOF
 
 # Fast track tmpfiles.d content from the base image, xref
 # https://gitlab.com/fedora/bootc/base-images/-/merge_requests/92
@@ -66,3 +80,23 @@ if ! grep -q -r sudo /usr/lib/sysusers.d; then
 g sudo 16
 EOF
 fi
+
+# dhcpcd
+if rpm -q dhcpcd &>/dev/null; then
+if ! grep -q -r dhcpcd /usr/lib/sysusers.d; then
+  cat >/usr/lib/sysusers.d/bootc-dhcpcd-workaround.conf <<'EOF'
+u dhcpcd - 'Minimalistic DHCP client' /var/lib/dhcpcd
+EOF
+fi
+cat >/usr/lib/tmpfiles.d/bootc-dhcpd.conf <<'EOF'
+d /var/lib/dhcpcd 0755 root dhcpcd - -
+EOF
+  rm -rf /var/lib/dhcpcd
+fi
+# dhclient
+if test -d /var/lib/dhclient; then
+  cat >/usr/lib/tmpfiles.d/bootc-dhclient.conf <<'EOF'
+d /var/lib/dhclient 0755 root root - -
+EOF
+  rm -rf /var/lib/dhclient
+fi

tests/build.sh

@@ -7,7 +7,7 @@ set -exuo pipefail
 # If provided should be of the form fedora-42 or centos-10
 target=${1:-}
 
-bcvk=$(which bcvk 2>/dev/null)
+bcvk=$(which bcvk 2>/dev/null || true)
 if test -z "${bcvk}" && test "$(id -u)" != 0; then
     echo "This script currently requires full root"; exit 1
 fi
@@ -40,7 +40,7 @@ just build-integration-test-image
 # for output artifacts
 mkdir -p target
 
-DISK=target/integration-test.raw
+DISK=target/bootc-integration-test.raw
 SIZE=10G
 rm -vf "${DISK}"
 if test -n "${bcvk}"; then
@@ -62,4 +62,9 @@ else
   --generic-image \
   --via-loopback \
   /target/$(basename ${DISK})
-fi
+fi
+# testcloud barfs on .raw sadly; FIXME drop this once it's been changed.
+# Alternatively we could teach bcvk how to write qcow2 easily enough.
+qemu-img convert -f raw -O qcow2 ${DISK} target/bootc-integration-test.qcow2
+rm -f "${DISK}"
+

tests/test.sh

@@ -12,84 +12,20 @@ set -exuo pipefail
 # Ensure we're in the topdir canonically
 cd $(git rev-parse --show-toplevel)
 
-DISK=target/integration-test.raw
-
-# Generate a temporary key
-SSH_KEY=$(pwd)/target/id_rsa
-rm -vf "${SSH_KEY}"*
-ssh-keygen -f "${SSH_KEY}" -N "" -q -t rsa-sha2-256 -b 4096
-chmod 600 "${SSH_KEY}"
+DISK=$(pwd)/target/bootc-integration-test.qcow2
+test -f "${DISK}"
 
 TMT_PLAN_NAME=$1
 shift
 
-SSH_OPTIONS=(-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o PasswordAuthentication=no -o ConnectTimeout=5)
-pubkey=$(base64 -w 0 < target/id_rsa.pub)
-ssh_tmpfiles=$(printf "d /root/.ssh 0750 - - -\nf+~ /root/.ssh/authorized_keys 700 - - - ${pubkey}" | base64 -w 0)
-ssh_cred="io.systemd.credential.binary:tmpfiles.extra="${ssh_tmpfiles}
-
-# TODO replace with tmt's virt provisioner
-ARCH=$(uname -m)
-qemu_args=()
-case "$ARCH" in
-"aarch64")
-  qemu_args+=(qemu-system-aarch64
-    -machine virt
-    -bios /usr/share/AAVMF/AAVMF_CODE.fd)
-  ;;
-"x86_64")
-  qemu_args+=(qemu-system-x86_64)
-  ;;
-*)
-  echo "Unhandled architecture: $ARCH" >&2
-  exit 1
-  ;;
-esac
-qemu_args+=(
-    -name bootc-vm
-    -enable-kvm
-    -cpu host
-    -m 2G
-    -drive file="target/disk.raw",if=virtio,format=raw
-    -snapshot
-    -net nic,model=virtio
-    -net user,hostfwd=tcp::2222-:22
-    -display none
-    -smbios type=11,value=${ssh_cred}
-)
-
-# Kill qemu when the test exits by default
-setpriv --pdeathsig SIGTERM -- ${qemu_args[@]} &>/dev/null &
-
-wait_for_ssh_up() {
-  SSH_STATUS=$(ssh "${SSH_OPTIONS[@]}" -i "$SSH_KEY" -p 2222 root@"${1}" '/bin/bash -c "echo -n READY"')
-  if [[ $SSH_STATUS == READY ]]; then
-    echo 1
-  else
-    echo 0
-  fi
-}
-
-for _ in $(seq 0 30); do
-  RESULT=$(wait_for_ssh_up "localhost")
-  if [[ $RESULT == 1 ]]; then
-    echo "SSH is ready now! 🥳"
-    break
-  fi
-  sleep 10
-done
-
-# Make sure VM is ready for testing
-ssh "${SSH_OPTIONS[@]}" \
-  -i "$SSH_KEY" \
-  -p 2222 \
-  root@localhost \
-  "bootc status"
-
 # Move the tmt bits to a subdirectory to work around https://github.com/teemtee/tmt/issues/4062
 rm target/tmt-workdir -rf
 mkdir target/tmt-workdir
 cp -a .fmf tmt target/tmt-workdir/
+
+# Hack around https://github.com/teemtee/testcloud/issues/17
+rm -vrf /var/tmp/tmt/testcloud/images/bootc-integration-test.qcow2
+
 cd target/tmt-workdir
 # TMT will rsync tmt-* scripts to TMT_SCRIPTS_DIR=/var/lib/tmt/scripts
-tmt run --all --verbose -e TMT_SCRIPTS_DIR=/var/lib/tmt/scripts provision --how connect --guest localhost --port 2222 --user root --key "$SSH_KEY" plan --name "/tmt/plans/integration/${TMT_PLAN_NAME}"
+tmt --context "test_disk_image=${DISK}" run --all --verbose -e TMT_SCRIPTS_DIR=/var/lib/tmt/scripts plan  --name "/tmt/plans/integration/${TMT_PLAN_NAME}"

tmt/plans/integration.fmf

@@ -1,7 +1,7 @@
 provision:
   how: virtual
   # Build via `./tests/build.sh`
-  image: target/integration-disk.img
+  image: $@{test_disk_image}
 execute:
   how: tmt