update workflow yaml

Author: tuhaihe

.github/workflows/sandbox-validation.yml

@@ -34,7 +34,7 @@
 # - On changes to sandbox-related files
 #
 # --------------------------------------------------------------------
-name: Sandbox Weekly Validation
+name: Sandbox Validation
 
 on:
   # Run every Monday at 02:00 UTC (weekly validation)
@@ -92,18 +92,26 @@ jobs:
           cd devops/sandbox
           ./run.sh -c ${{ matrix.version }}
 
-          echo "Waiting for deployment to complete..."
-          for i in {1..30}; do
+          echo "Waiting for container to initialize (30s)..."
+          sleep 30
+
+          echo "Waiting for deployment to complete (up to 6 minutes)..."
+          for i in {1..36}; do
             if docker logs cbdb-cdw 2>&1 | grep -q "DEPLOYMENT SUCCESSFUL"; then
               echo "✅ Deployment completed successfully"
               break
             fi
+            if docker logs cbdb-cdw 2>&1 | grep -q "Postgres version does not match"; then
+              echo "ERROR: Postgres version mismatch detected"
+              docker logs cbdb-cdw
+              exit 1
+            fi
             if ! docker ps | grep -q cbdb-cdw; then
               echo "ERROR: Container stopped unexpectedly"
               docker logs cbdb-cdw
               exit 1
             fi
-            [ $i -eq 30 ] && echo "ERROR: Deployment timeout" && docker logs cbdb-cdw && exit 1
+            [ $i -eq 36 ] && echo "ERROR: Deployment timeout after 6 minutes" && docker logs cbdb-cdw && exit 1
             sleep 10
           done
         timeout-minutes: 30
@@ -172,28 +180,45 @@ jobs:
           cd devops/sandbox
           ./run.sh -c ${{ matrix.version }} -m
 
-          echo "Waiting for Apache Cloudberry multi-node deployment to complete..."
-          for i in {1..24}; do
+          echo "Waiting for all containers to fully initialize (90s)..."
+          sleep 90
+
+          echo "Checking all containers are running..."
+          for container in cbdb-cdw cbdb-scdw cbdb-sdw1 cbdb-sdw2; do
+            if ! docker ps | grep -q $container; then
+              echo "ERROR: Container $container not running"
+              docker ps -a
+              exit 1
+            fi
+          done
+
+          echo "Waiting for multi-node deployment to complete (up to 8 minutes)..."
+          for i in {1..32}; do
             if docker logs cbdb-cdw 2>&1 | grep -q "DEPLOYMENT SUCCESSFUL"; then
               echo "✅ Multi-node deployment completed"
               break
             fi
+            if docker logs cbdb-cdw 2>&1 | grep -q "Timeout waiting for SSH"; then
+              echo "ERROR: SSH timeout detected"
+              docker logs cbdb-cdw
+              exit 1
+            fi
             if ! docker ps | grep -q cbdb-cdw; then
               echo "ERROR: Coordinator stopped unexpectedly"
               docker logs cbdb-cdw
               exit 1
             fi
-            [ $i -eq 24 ] && echo "ERROR: Deployment timeout" && docker logs cbdb-cdw && exit 1
+            [ $i -eq 32 ] && echo "ERROR: Deployment timeout after 8 minutes" && docker logs cbdb-cdw && exit 1
             sleep 15
           done
-        timeout-minutes: 30
+        timeout-minutes: 35
 
       - name: Test SSH connectivity between nodes
         run: |
           echo "Testing SSH connectivity from coordinator to all nodes..."
-          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 sdw1 'hostname'"
-          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 sdw2 'hostname'"
-          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 scdw 'hostname'"
+          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=20 sdw1 'hostname'"
+          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=20 sdw2 'hostname'"
+          docker exec -u gpadmin cbdb-cdw bash -l -c "ssh -o StrictHostKeyChecking=no -o ConnectTimeout=20 scdw 'hostname'"
           echo "✅ SSH connectivity verified"
 
       - name: Test database operations