(airavata) branch master updated: fix(devstack): make reset a true wipe and retry the ingress check (#690)

[yasith]

This is an automated email from the ASF dual-hosted git repository.

yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new ae8c3d5aa4 fix(devstack): make reset a true wipe and retry the ingress 
check (#690)
ae8c3d5aa4 is described below

commit ae8c3d5aa4ec0a16290919cc1aaf656651bac4f5
Author: Yasith Jayawardana <yas...@gatech.edu>
AuthorDate: Sun Jun 14 02:57:30 2026 -0400

    fix(devstack): make reset a true wipe and retry the ingress check (#690)
    
    devstack reset only ran `colima delete`, but colima keeps a persistent Lima 
data disk under _lima/_disks/<instance> (bind-mounted to /var/lib/docker) that 
survives the delete, so images, volumes and restart:unless-stopped containers 
resurrected on the next VM start. Remove that disk so reset is a true 
from-scratch wipe.
    
    Also wrap the verify gate's :443 check in a short retry loop so a freshly 
pulled / cold Traefik does not spuriously fail it.
---
 devstack/lib/commands.sh | 9 ++++++++-
 devstack/lib/verify.sh   | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/commands.sh b/devstack/lib/commands.sh
index 9314e3c924..c629813830 100644
--- a/devstack/lib/commands.sh
+++ b/devstack/lib/commands.sh
@@ -39,5 +39,12 @@ devstack_down() {  # stop the shared ingress + the VM 
(GLOBAL — affects all pr
 devstack_reset() {  # GLOBAL destructive — wipes ALL projects' state
   echo "WARNING: deletes the shared VM and ALL projects' data on it."
   read -r -p "type the profile name to confirm: " c
-  [ "$c" = "$DEVSTACK_PROFILE" ] && colima delete -p "$DEVSTACK_PROFILE" -f || 
echo "aborted"
+  if [ "$c" != "$DEVSTACK_PROFILE" ]; then echo "aborted"; return; fi
+  colima delete -p "$DEVSTACK_PROFILE" -f
+  # colima/Lima keeps a persistent data disk under _lima/_disks/<instance> 
(bind-mounted
+  # to /var/lib/docker) that SURVIVES `colima delete`, so images, volumes and
+  # `restart: unless-stopped` containers resurrect on the next VM start. 
Remove it so
+  # reset is a true from-scratch wipe.
+  local inst="colima-$DEVSTACK_PROFILE"; [ "$DEVSTACK_PROFILE" = default ] && 
inst="colima"
+  rm -rf "$HOME/.colima/_lima/_disks/$inst"
 }
diff --git a/devstack/lib/verify.sh b/devstack/lib/verify.sh
index 9b7e4d36ba..490ba6ee63 100644
--- a/devstack/lib/verify.sh
+++ b/devstack/lib/verify.sh
@@ -7,7 +7,14 @@ devstack_verify() {
     linux)
       getent hosts "$host" | grep -q '127.0.0.1' || { echo "DNS FAIL: $host 
!-> 127.0.0.1"; ok=0; } ;;
   esac
-  nc -z -w2 127.0.0.1 443 || { echo "INGRESS FAIL: nothing on 127.0.0.1:443"; 
ok=0; }
+  # Traefik may have only just started (fresh image pull / cold boot); retry 
briefly so
+  # a not-yet-ready ingress doesn't spuriously fail the gate.
+  local i ingress=0
+  for i in $(seq 1 15); do
+    nc -z -w2 127.0.0.1 443 && { ingress=1; break; }
+    sleep 1
+  done
+  [ "$ingress" = 1 ] || { echo "INGRESS FAIL: nothing on 127.0.0.1:443 after 
retries"; ok=0; }
   [ "$ok" = 1 ] && echo "devstack verify: OK ($host -> 127.0.0.1, Traefik :443 
up)"
   [ "$ok" = 1 ]
 }