fix(smoke): reuse existing PVE-side ISO instead of delete+re-upload
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>
This commit is contained in:
parent
2cc3fab027
commit
afbb8d59f9
1 changed files with 11 additions and 12 deletions
|
|
@ -69,21 +69,20 @@ echo "==> node=$NODE sha=$SHORT_SHA iso=$(basename "$ISO_PATH")"
|
||||||
ISO_NAME="furtka-${SHORT_SHA}.iso"
|
ISO_NAME="furtka-${SHORT_SHA}.iso"
|
||||||
VOLID="${ISO_STORAGE}:iso/${ISO_NAME}"
|
VOLID="${ISO_STORAGE}:iso/${ISO_NAME}"
|
||||||
|
|
||||||
# --- Step 1: upload ISO ----------------------------------------------------
|
# --- Step 1: upload ISO (or reuse if same SHA already on PVE) ---------------
|
||||||
# PVE's upload endpoint errors if the file exists. Delete first so re-runs
|
# For a given commit SHA the ISO bytes are reproducible, so if furtka-<sha>.iso
|
||||||
# on the same SHA (e.g. workflow re-dispatch) work.
|
# 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" \
|
if api "$API/nodes/$NODE/storage/$ISO_STORAGE/content/$VOLID" \
|
||||||
--output /dev/null 2>/dev/null; then
|
--output /dev/null 2>/dev/null; then
|
||||||
echo "==> removing stale ISO $VOLID"
|
echo "==> reusing existing ISO $VOLID"
|
||||||
api --request DELETE "$API/nodes/$NODE/storage/$ISO_STORAGE/content/$VOLID" \
|
else
|
||||||
--output /dev/null
|
echo "==> uploading ISO as $ISO_NAME"
|
||||||
fi
|
api --request POST "$API/nodes/$NODE/storage/$ISO_STORAGE/upload" \
|
||||||
|
|
||||||
echo "==> uploading ISO as $ISO_NAME"
|
|
||||||
api --request POST "$API/nodes/$NODE/storage/$ISO_STORAGE/upload" \
|
|
||||||
--form "content=iso" \
|
--form "content=iso" \
|
||||||
--form "filename=@${ISO_PATH};filename=${ISO_NAME}" \
|
--form "filename=@${ISO_PATH};filename=${ISO_NAME}" \
|
||||||
> /dev/null
|
> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
# --- Step 2: pick a free VMID in the reserved range ------------------------
|
# --- 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.
|
# List VMs on the node, filter by range, pick the lowest integer not in use.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue