Merge pull request 'fix(smoke): reuse existing PVE-side ISO instead of delete+re-upload' (#5 ) from fix-smoke-reuse-iso into main

Reviewed-on: #5
fix(smoke): reuse existing PVE-side ISO instead of delete+re-upload
2026-04-18 14:00:40 +02:00 · 2026-04-18 13:59:42 +02:00
1 changed files with 11 additions and 12 deletions
--- a/scripts/smoke-vm.sh
+++ b/scripts/smoke-vm.sh
@ -69,21 +69,20 @@ echo "==> node=$NODE sha=$SHORT_SHA iso=$(basename "$ISO_PATH")"
 ISO_NAME="furtka-${SHORT_SHA}.iso"
 VOLID="${ISO_STORAGE}:iso/${ISO_NAME}"

-# --- Step 1: upload ISO ----------------------------------------------------
-# PVE's upload endpoint errors if the file exists. Delete first so re-runs
-# on the same SHA (e.g. workflow re-dispatch) work.
+# --- Step 1: upload ISO (or reuse if same SHA already on PVE) ---------------
+# For a given commit SHA the ISO bytes are reproducible, so if furtka-<sha>.iso
+# is already in PVE storage from a prior smoke run we reuse it and skip the
+# upload. Avoids DELETE-permission friction and shaves ~2 min off re-runs.
 if api "$API/nodes/$NODE/storage/$ISO_STORAGE/content/$VOLID" \
      --output /dev/null 2>/dev/null; then
-  echo "==> removing stale ISO $VOLID"
-  api --request DELETE "$API/nodes/$NODE/storage/$ISO_STORAGE/content/$VOLID" \
-      --output /dev/null
-fi
-
-echo "==> uploading ISO as $ISO_NAME"
-api --request POST "$API/nodes/$NODE/storage/$ISO_STORAGE/upload" \
+  echo "==> reusing existing ISO $VOLID"
+else
+  echo "==> uploading ISO as $ISO_NAME"
+  api --request POST "$API/nodes/$NODE/storage/$ISO_STORAGE/upload" \
      --form "content=iso" \
      --form "filename=@${ISO_PATH};filename=${ISO_NAME}" \
      > /dev/null
+fi

 # --- Step 2: pick a free VMID in the reserved range ------------------------
 # List VMs on the node, filter by range, pick the lowest integer not in use.
Author	SHA1	Message	Date
daniel	cb6e92aa92	Merge pull request 'fix(smoke): reuse existing PVE-side ISO instead of delete+re-upload' (#5 ) from fix-smoke-reuse-iso into main Some checks failed CI / validate-json (push) Waiting to run Details CI / markdown-links (push) Waiting to run Details Build ISO / build-iso (push) Has been cancelled Details CI / lint (push) Has been cancelled Details CI / test (push) Has been cancelled Details Reviewed-on: #5	2026-04-18 14:00:40 +02:00
Daniel Maksymilian Syrnicki	afbb8d59f9	fix(smoke): reuse existing PVE-side ISO instead of delete+re-upload Some checks failed CI / markdown-links (pull_request) Waiting to run Details CI / lint (pull_request) Successful in 1m5s Details CI / validate-json (pull_request) Has been cancelled Details CI / test (pull_request) Has been cancelled Details The delete branch required Datastore.Allocate (or was hitting a privilege-separated token ACL edge case) and produced 403s on re-runs against the same commit SHA. Since the ISO bytes are reproducible for a given SHA — furtka-<sha>.iso is content-addressed — we can just reuse whatever is already in PVE storage instead of cycling it. Fixes the "runs-on-same-sha" re-dispatch case without needing any extra PVE permission, and shaves ~2 min off repeated smoke runs. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-04-18 13:59:42 +02:00