Refactor e2e tests to use shared CustomPiOS distro_testing framework

Replace standalone testing scripts with the shared framework from
CustomPiOS/src/distro_testing/. The CI workflow now checks out CustomPiOS
and copies the shared scripts into the build context. OctoPi-specific logic
moves into hooks/ (haproxy IPv4 patching, headless browser screenshot).

Removes run-test.sh and testing/scripts/ (now provided by the framework).

Author: guysoft

.github/workflows/build.yml

@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'guysoft/CustomPiOS'
+          ref: feature/e2e
           path: CustomPiOS
 
       - name: Checkout Project Repository
@@ -76,12 +77,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Checkout CustomPiOS
+        uses: actions/checkout@v4
+        with:
+          repository: 'guysoft/CustomPiOS'
+          ref: feature/e2e
+          path: CustomPiOS
+
       - name: Download arm64 image from build
         uses: actions/download-artifact@v4
         with:
           name: octopi-arm64
           path: image/
 
+      - name: Prepare testing context
+        run: |
+          mkdir -p testing/custompios
+          cp -r CustomPiOS/src/distro_testing/scripts testing/custompios/scripts
+          cp -r CustomPiOS/src/distro_testing/tests testing/custompios/tests
+
       - name: Build test Docker image
         run: DOCKER_BUILDKIT=0 docker build -t octopi-e2e-test ./testing/
 
@@ -94,6 +108,7 @@ jobs:
             -v "$PWD/artifacts:/output" \
             -v "$(realpath $IMG):/input/image.img:ro" \
             -e ARTIFACTS_DIR=/output \
+            -e DISTRO_NAME="OctoPi" \
             -e KEEP_ALIVE=true \
             octopi-e2e-test
 

testing/.gitignore

@@ -1 +1,3 @@
 images/
+custompios/
+*.png

testing/Dockerfile

@@ -2,10 +2,19 @@ FROM ptrsr/pi-ci:latest
 
 ENV LIBGUESTFS_BACKEND=direct
 
-RUN apt-get update && apt-get install -y --no-install-recommends sshpass openssh-client curl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    sshpass openssh-client curl socat imagemagick \
+    && rm -rf /var/lib/apt/lists/*
 
-COPY scripts/ /test/scripts/
+# Shared framework from CustomPiOS (copied into build context by CI)
+COPY custompios/scripts/ /test/scripts/
+COPY custompios/tests/ /test/tests/
+
+# OctoPi-specific tests and hooks
 COPY tests/ /test/tests/
-RUN chmod +x /test/scripts/*.sh /test/tests/*.sh
+COPY hooks/ /test/hooks/
+
+RUN chmod +x /test/scripts/*.sh /test/tests/*.sh; \
+    chmod +x /test/hooks/*.sh 2>/dev/null || true
 
 ENTRYPOINT ["/test/scripts/entrypoint.sh"]

testing/hooks/prepare-image.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+IMAGE_FILE="${1:?Usage: $0 <image.qcow2>}"
+
+export LIBGUESTFS_BACKEND=direct
+export LIBGUESTFS_DEBUG=0
+export LIBGUESTFS_TRACE=0
+
+echo '=== OctoPi-specific image patches ==='
+
+echo 'Downloading haproxy config for IPv4 patching...'
+guestfish -a "$IMAGE_FILE" <<GFEOF
+run
+mount /dev/sda2 /
+download /etc/haproxy/haproxy.cfg /tmp/haproxy.cfg
+umount /
+GFEOF
+
+echo 'Fixing haproxy for IPv4-only (QEMU has no IPv6)...'
+sed -i 's/bind :::80 v4v6/bind *:80/' /tmp/haproxy.cfg
+sed -i 's/bind :::443 v4v6/bind *:443/' /tmp/haproxy.cfg
+
+guestfish -a "$IMAGE_FILE" <<GFEOF2
+run
+mount /dev/sda2 /
+upload /tmp/haproxy.cfg /etc/haproxy/haproxy.cfg
+umount /
+GFEOF2
+
+echo 'OctoPi patches applied'

testing/hooks/screenshot.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+SSH_HOST="${1:-localhost}"
+SSH_PORT="${2:-2222}"
+ARTIFACTS_DIR="${3:-/output}"
+
+SSH_CMD="sshpass -p raspberry ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PreferredAuthentications=password -o PubkeyAuthentication=no -o LogLevel=ERROR -p $SSH_PORT ${SSH_HOST}"
+
+echo "Capturing OctoPrint web UI artifacts..."
+
+# Save rendered HTML via curl through SSH (inside the guest, hitting localhost:80)
+BODY=$(${SSH_CMD} -l pi "curl -s http://localhost" 2>/dev/null || echo "")
+
+if [ -n "$BODY" ]; then
+    echo "$BODY" > "$ARTIFACTS_DIR/octoprint-ui.html"
+    echo "  Saved OctoPrint HTML to artifacts"
+fi
+
+# Attempt headless screenshot from inside the container if a browser is available
+HTTP_PORT="${QEMU_HTTP_PORT:-8080}"
+for BROWSER in chromium chromium-browser google-chrome; do
+    if command -v "$BROWSER" &>/dev/null; then
+        echo "  Using $BROWSER for headless screenshot..."
+        "$BROWSER" --headless --disable-gpu --no-sandbox \
+            --virtual-time-budget=10000 \
+            --screenshot="$ARTIFACTS_DIR/screenshot.png" \
+            --window-size=1280,720 \
+            "http://localhost:${HTTP_PORT}" 2>/dev/null || true
+        if [ -f "$ARTIFACTS_DIR/screenshot.png" ]; then
+            echo "  Browser screenshot saved"
+            exit 0
+        fi
+    fi
+done
+
+echo "  No headless browser available in container (HTML artifact saved instead)"