ci: Move disk wrapper into Justfile

So it can be executed more generically on any container image as
input and write to output.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

Justfile

@@ -23,6 +23,40 @@ build-integration-test-image *ARGS:
 build-install-test-image: build-integration-test-image
     cd hack && podman build -t localhost/bootc-integration-install -f Containerfile.drop-lbis
 
+build-disk-image container target:
+    #!/bin/bash
+    set -xeuo pipefail
+    SIZE=20G
+    bcvk=$(which bcvk 2>/dev/null || true)
+    if test -z "${bcvk}" && test "$(id -u)" != 0; then
+        echo "This task currently requires full root"; exit 1
+    fi
+    # testcloud barfs on .raw
+    if test -n "${bcvk}"; then
+      bcvk to-disk --format=qcow2 --disk-size "${SIZE}" --filesystem ext4 {{container}} {{target}}
+    else
+      TMPDISK={{target}}.raw
+      truncate -s "${SIZE}" "${TMPDISK}"
+      podman run \
+        --rm \
+        --privileged \
+        --pid=host \
+        --security-opt label=type:unconfined_t \
+        -v /var/lib/containers:/var/lib/containers \
+        -v /dev:/dev \
+        -v $(pwd)/target:/target \
+        localhost/bootc-integration \
+        bootc install to-disk \
+        --filesystem "ext4" \
+        --karg=console=ttyS0,115200n8 \
+        --generic-image \
+        --via-loopback \
+        /target/$(basename ${TMPDISK})
+      qemu-img convert -f raw -O qcow2 ${TMPDISK} {{target}}
+      rm -f "${TMPDISK}"
+    fi
+
+
 # These tests accept the container image as input, and may spawn it.
 run-container-external-tests:
    ./tests/container/run localhost/bootc

tests/build.sh

@@ -6,12 +6,6 @@ set -exuo pipefail
 
 # If provided should be of the form fedora-42 or centos-10
 target=${1:-}
-
-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
-
 build_args=()
 if test -n "${target:-}"; then
     shift
@@ -39,31 +33,4 @@ just build-integration-test-image
 # Host builds will have this already, but we use it as a general dumping space
 # for output artifacts
 mkdir -p target
-
-SIZE=10G
-DISK=target/bootc-integration-test.qcow2
-rm -vf "${DISK}"
-# testcloud barfs on .raw
-if test -n "${bcvk}"; then
-  bcvk to-disk --format=qcow2 --disk-size "${SIZE}" --filesystem ext4 localhost/bootc-integration "${DISK}"
-else
-  TMPDISK=target/bootc-integration-test.raw
-  truncate -s "${SIZE}" "${TMPDISK}"
-  podman run \
-    --rm \
-    --privileged \
-    --pid=host \
-    --security-opt label=type:unconfined_t \
-    -v /var/lib/containers:/var/lib/containers \
-    -v /dev:/dev \
-    -v $(pwd)/target:/target \
-    localhost/bootc-integration \
-    bootc install to-disk \
-    --filesystem "ext4" \
-    --karg=console=ttyS0,115200n8 \
-    --generic-image \
-    --via-loopback \
-    /target/$(basename ${TMPDISK})
-  qemu-img convert -f raw -O qcow2 ${TMPDISK} ${DISK}
-  rm -f "${TMPDISK}"
-fi
+just build-disk-image localhost/bootc-integration target/bootc-integration-test.qcow2