Skip to content

Commit 9290ada

Browse files
committed
ci: fix Taskfile YAML indentation in infra:attach-storage-disks-hotplug script and keep lsblk debug
1 parent 7a115cd commit 9290ada

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

ci/dvp-e2e/Taskfile.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ tasks:
264264
for i in $(seq 1 50); do
265265
phase=$(kubectl -n {{ .NAMESPACE }} get vm "$vm" -o jsonpath='{.status.phase}' 2>/dev/null || true)
266266
if [ "$phase" = "Running" ]; then
267-
echo "[INFRA] VM $vm is Running"; break
268-
fi
269-
echo "[INFRA] VM $vm phase=$phase; retry $i/50"; sleep 10
270-
done
267+
echo "[INFRA] VM $vm is Running"; break
268+
fi
269+
echo "[INFRA] VM $vm phase=$phase; retry $i/50"; sleep 10
270+
done
271271
272272
for disk_num in $(seq 1 {{ .DISK_COUNT }}); do
273273
vd="storage-disk-${disk_num}-$vm"
@@ -389,27 +389,27 @@ tasks:
389389
| jq -r '{phase: .status.phase, blockDeviceRefs: (.status.blockDeviceRefs // []) | map({name, virtualMachineBlockDeviceAttachmentName, attached, hotplugged})}' || true
390390
exit 1
391391
fi
392-
done
392+
done
393393
394-
echo "[INFRA] VM $vm configured with hotplug disks"
394+
echo "[INFRA] VM $vm configured with hotplug disks"
395395
396-
# Optional on-node lsblk debug snapshot (requires d8 and SSH key). Always sudo for block devices visibility.
397-
if command -v d8 >/dev/null 2>&1; then
398-
echo "[DEBUG] Collecting lsblk from VM $vm..."
399-
if ! d8 v ssh --username='{{ .DEFAULT_USER }}' \
400-
--identity-file='{{ .SSH_DIR }}/{{ .SSH_FILE_NAME }}' \
401-
--local-ssh=true \
402-
--local-ssh-opts='-o StrictHostKeyChecking=no' \
403-
--local-ssh-opts='-o UserKnownHostsFile=/dev/null' \
404-
"${vm}.{{ .NAMESPACE }}" -c "sudo lsblk -o NAME,KNAME,TYPE,SIZE,MODEL,TRAN,FSTYPE,MOUNTPOINT -p"; then
405-
echo "[WARN] lsblk collection failed for $vm (SSH)" >&2
406-
fi
407-
else
408-
echo "[WARN] 'd8' CLI not found, skipping lsblk collection for $vm" >&2
409-
fi
410-
done
396+
# Optional on-node lsblk debug snapshot (requires d8 and SSH key). Always sudo for block devices visibility.
397+
if command -v d8 >/dev/null 2>&1; then
398+
echo "[DEBUG] Collecting lsblk from VM $vm..."
399+
if ! d8 v ssh --username='{{ .DEFAULT_USER }}' \
400+
--identity-file='{{ .SSH_DIR }}/{{ .SSH_FILE_NAME }}' \
401+
--local-ssh=true \
402+
--local-ssh-opts='-o StrictHostKeyChecking=no' \
403+
--local-ssh-opts='-o UserKnownHostsFile=/dev/null' \
404+
"${vm}.{{ .NAMESPACE }}" -c "sudo lsblk -o NAME,KNAME,TYPE,SIZE,MODEL,TRAN,FSTYPE,MOUNTPOINT -p"; then
405+
echo "[WARN] lsblk collection failed for $vm (SSH)" >&2
406+
fi
407+
else
408+
echo "[WARN] 'd8' CLI not found, skipping lsblk collection for $vm" >&2
409+
fi
410+
done
411411
412-
echo "[INFRA] All worker VMs configured with storage disks via hotplug"
412+
echo "[INFRA] All worker VMs configured with storage disks via hotplug"
413413
414414
infra:attach-worker-disks:
415415
desc: Attach additional data disks to worker VMs (for SDS)

0 commit comments

Comments
 (0)