Merge branch 'master' into feature/webvtt-regression-test

Author: Rahul-2k4

.github/workflows/sp-deployment-pipeline.yml

@@ -29,10 +29,10 @@ jobs:
           username: ${{ vars.SSH_USER }}
           key: ${{ secrets.SSH_KEY_PRIVATE }}
           port: 22
-          script_stop: true
           command_timeout: 2m
           envs: INSTALL_FOLDER,SAMPLE_REPOSITORY,DEPLOY_BRANCH
           script: |
+            set -e
             echo "=== Pre-deployment checks ==="
             cd $INSTALL_FOLDER
 
@@ -58,10 +58,10 @@ jobs:
           username: ${{ vars.SSH_USER }}
           key: ${{ secrets.SSH_KEY_PRIVATE }}
           port: 22
-          script_stop: true
           command_timeout: 10m
           envs: INSTALL_FOLDER,SAMPLE_REPOSITORY,DEPLOY_BRANCH
           script: |
+            set -e
             echo "=== Deploying application ==="
             cd $INSTALL_FOLDER
 
@@ -99,7 +99,6 @@ jobs:
           username: ${{ vars.SSH_USER }}
           key: ${{ secrets.SSH_KEY_PRIVATE }}
           port: 22
-          script_stop: false
           command_timeout: 2m
           envs: INSTALL_FOLDER
           script: |
@@ -139,7 +138,6 @@ jobs:
           username: ${{ vars.SSH_USER }}
           key: ${{ secrets.SSH_KEY_PRIVATE }}
           port: 22
-          script_stop: false
           command_timeout: 5m
           envs: INSTALL_FOLDER,SAMPLE_REPOSITORY
           script: |
@@ -175,7 +173,6 @@ jobs:
           username: ${{ vars.SSH_USER }}
           key: ${{ secrets.SSH_KEY_PRIVATE }}
           port: 22
-          script_stop: false
           command_timeout: 30s
           envs: INSTALL_FOLDER
           script: |

install/deploy/post_deploy.sh

@@ -31,8 +31,8 @@ echo "--- Health check ---"
 for i in $(seq 1 $MAX_RETRIES); do
     echo "Attempt $i/$MAX_RETRIES..."
 
-    # Try the /health endpoint first
-    HTTP_CODE=$(curl -s -o /tmp/health_response.json -w "%{http_code}" "$HEALTH_URL" 2>/dev/null || echo "000")
+    # Try the /health endpoint first (use -L to follow HTTP->HTTPS redirects)
+    HTTP_CODE=$(curl -sL -o /tmp/health_response.json -w "%{http_code}" "$HEALTH_URL" 2>/dev/null || echo "000")
 
     if [ "$HTTP_CODE" = "200" ]; then
         echo "✓ Health check passed (HTTP $HTTP_CODE)"
@@ -43,9 +43,9 @@ for i in $(seq 1 $MAX_RETRIES); do
         echo "=== Deployment verified successfully ==="
         exit 0
     elif [ "$HTTP_CODE" = "404" ]; then
-        # Health endpoint doesn't exist, try fallback
+        # Health endpoint doesn't exist, try fallback (use -L to follow redirects)
         echo "Health endpoint not found, trying fallback URL..."
-        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" "$FALLBACK_URL" 2>/dev/null || echo "000")
+        HTTP_CODE=$(curl -sL -o /dev/null -w "%{http_code}" "$FALLBACK_URL" 2>/dev/null || echo "000")
         if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 400 ]; then
             echo "✓ Fallback check passed (HTTP $HTTP_CODE)"
             echo ""

migrations/versions/c8f3a2b1d4e5_.py

@@ -0,0 +1,34 @@
+"""Add pending_deletion table for VM deletion tracking
+
+Revision ID: c8f3a2b1d4e5
+Revises: 7793881905c5
+Create Date: 2025-12-30 12:00:00.000000
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = 'c8f3a2b1d4e5'
+down_revision = '7793881905c5'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('pending_deletion',
+        sa.Column('vm_name', sa.String(length=64), nullable=False),
+        sa.Column('operation_name', sa.String(length=128), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('retry_count', sa.Integer(), nullable=False),
+        sa.PrimaryKeyConstraint('vm_name'),
+        mysql_engine='InnoDB'
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('pending_deletion')
+    # ### end Alembic commands ###