Fix Darwin builder timeout guard and e2e build ID handling

Author: cursoragent

integration/builder_cache_darwin_test.go

@@ -9,6 +9,7 @@ import (
 	"runtime"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/kernel/hypeman/cmd/api/config"
 	"github.com/kernel/hypeman/lib/hypervisor"
@@ -19,6 +20,12 @@ func requireBuilderIntegrationHost(t *testing.T) {
 	if runtime.GOARCH != "arm64" {
 		t.Skip("VZ builder integration test requires Apple Silicon")
 	}
+	if deadline, ok := t.Deadline(); ok {
+		const minTimeout = 20 * time.Minute
+		if time.Until(deadline) < minTimeout {
+			t.Skipf("builder integration test requires go test timeout >= %s", minTimeout)
+		}
+	}
 	if _, err := exec.LookPath("docker"); err != nil {
 		t.Skip("builder integration test requires Docker")
 	}

scripts/e2e-install-test.sh

@@ -20,6 +20,35 @@ error() { echo -e "${RED}[ERROR]${NC} $1"; exit 1; }
 pass() { echo -e "${GREEN}[PASS]${NC} $1"; }
 fail() { echo -e "${RED}[FAIL]${NC} $1"; exit 1; }
 
+ensure_docker_ready() {
+    if docker info >/dev/null 2>&1; then
+        return 0
+    fi
+
+    if [ "$OS" = "darwin" ] && command -v colima >/dev/null 2>&1; then
+        warn "Docker daemon is not running; starting Colima..."
+        if colima status >/dev/null 2>&1; then
+            colima stop --force || true
+        fi
+        if ! colima start; then
+            colima stop --force || true
+            if ! colima start; then
+                colima delete --force
+                colima start
+            fi
+        fi
+    fi
+
+    for attempt in $(seq 1 30); do
+        if docker info >/dev/null 2>&1; then
+            return 0
+        fi
+        sleep 2
+    done
+
+    fail "Docker daemon is required for hypeman build E2E coverage"
+}
+
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -215,6 +244,7 @@ pass "hypeman rm works"
 # Build a real image through the installed CLI. This exercises provider wiring,
 # the VZ builder VM, guest-to-host registry access, and the resulting image.
 E2E_BUILD_VM_NAME="e2e-build-test-vm"
+ensure_docker_ready
 BUILD_CONTEXT=$(mktemp -d)
 BUILD_OUTPUT_FILE=$(mktemp)
 trap 'rm -rf "${BUILD_CONTEXT:-}" "${BUILD_OUTPUT_FILE:-}"' EXIT
@@ -226,7 +256,7 @@ EOF
 
 BUILD_OK=false
 for i in $(seq 1 30); do
-    if $HYPEMAN_CMD build --file Dockerfile --timeout 600 \
+    if $HYPEMAN_CMD --format json --transform id build --file Dockerfile --timeout 600 \
         --image-name e2e/build-smoke:latest "$BUILD_CONTEXT" >"$BUILD_OUTPUT_FILE" 2>&1; then
         BUILD_OK=true
         break
@@ -240,7 +270,7 @@ for i in $(seq 1 30); do
 done
 [ "$BUILD_OK" = true ] || { cat "$BUILD_OUTPUT_FILE"; fail "hypeman build did not become ready"; }
 cat "$BUILD_OUTPUT_FILE"
-BUILD_ID=$(sed -n 's/^Build started: //p' "$BUILD_OUTPUT_FILE" | tail -1)
+BUILD_ID=$(tr -d '"[:space:]' < "$BUILD_OUTPUT_FILE")
 [ -n "$BUILD_ID" ] || fail "hypeman build output did not include a build ID"
 BUILD_IMAGE=$($HYPEMAN_CMD --format json --transform image_ref build get "$BUILD_ID") || fail "hypeman build get failed"
 BUILD_IMAGE=${BUILD_IMAGE#\"}