Merge pull request #328 from microsoft/psl-test-integrate

ci: smoke test case integration

Author: Prajwal-Microsoft

.github/workflows/job-deploy-linux.yml

@@ -277,7 +277,44 @@ jobs:
           echo "WEBAPP_URL=${WEBAPP_URL}" >> $GITHUB_ENV
           echo "WEBAPP_URL=${WEBAPP_URL}" >> $GITHUB_OUTPUT
 
+      - name: Remove APPLICATIONINSIGHTS_CONNECTION_STRING for WAF Deployment
+        if: inputs.WAF_ENABLED == 'true'
+        shell: bash
+        env:
+          INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
+        run: |
+          echo "🔧 WAF Deployment detected - Removing APPLICATIONINSIGHTS_CONNECTION_STRING from backend container app..."
+          
+          # Get the backend container app name
+          BACKEND_APP_NAME=$(az containerapp list --resource-group "$INPUT_RESOURCE_GROUP_NAME" --query "[?contains(name, 'backend')].name" -o tsv | head -1)
+          
+          if [[ -z "$BACKEND_APP_NAME" ]]; then
+            echo "❌ ERROR: Could not find backend container app in resource group $INPUT_RESOURCE_GROUP_NAME"
+            exit 1
+          fi
+          
+          echo "Found backend container app: $BACKEND_APP_NAME"
+          
+          # Remove the APPLICATIONINSIGHTS_CONNECTION_STRING environment variable
+          az containerapp update \
+            --name "$BACKEND_APP_NAME" \
+            --resource-group "$INPUT_RESOURCE_GROUP_NAME" \
+            --remove-env-vars APPLICATIONINSIGHTS_CONNECTION_STRING
+          
+          echo "✅ Successfully removed APPLICATIONINSIGHTS_CONNECTION_STRING from $BACKEND_APP_NAME"
+          
+          # Wait for the container app to restart and become healthy
+          echo "⏳ Waiting for backend container app to restart..."
+          sleep 30
+          
+          # Verify the container app is running
+          APP_STATUS=$(az containerapp show --name "$BACKEND_APP_NAME" --resource-group "$INPUT_RESOURCE_GROUP_NAME" --query "properties.runningStatus" -o tsv)
+          echo "Backend container app status: $APP_STATUS"
+          
+          echo "✅ WAF workaround applied successfully"
+
       - name: Assign Contributor role to Service Principal
+        continue-on-error: true
         if: always()
         env:
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}

.github/workflows/job-deploy-windows.yml

@@ -285,7 +285,44 @@ jobs:
           "WEBAPP_URL=$WEBAPP_URL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
           "WEBAPP_URL=$WEBAPP_URL" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
 
+      - name: Remove APPLICATIONINSIGHTS_CONNECTION_STRING for WAF Deployment
+        if: inputs.WAF_ENABLED == 'true'
+        shell: pwsh
+        env:
+          INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
+        run: |
+          Write-Host "🔧 WAF Deployment detected - Removing APPLICATIONINSIGHTS_CONNECTION_STRING from backend container app..."
+          
+          # Get the backend container app name
+          $BACKEND_APP_NAME = az containerapp list --resource-group "$env:INPUT_RESOURCE_GROUP_NAME" --query "[?contains(name, 'backend')].name" -o tsv | Select-Object -First 1
+          
+          if ([string]::IsNullOrEmpty($BACKEND_APP_NAME)) {
+            Write-Host "❌ ERROR: Could not find backend container app in resource group $env:INPUT_RESOURCE_GROUP_NAME"
+            exit 1
+          }
+          
+          Write-Host "Found backend container app: $BACKEND_APP_NAME"
+          
+          # Remove the APPLICATIONINSIGHTS_CONNECTION_STRING environment variable
+          az containerapp update `
+            --name "$BACKEND_APP_NAME" `
+            --resource-group "$env:INPUT_RESOURCE_GROUP_NAME" `
+            --remove-env-vars APPLICATIONINSIGHTS_CONNECTION_STRING
+          
+          Write-Host "✅ Successfully removed APPLICATIONINSIGHTS_CONNECTION_STRING from $BACKEND_APP_NAME"
+          
+          # Wait for the container app to restart and become healthy
+          Write-Host "⏳ Waiting for backend container app to restart..."
+          Start-Sleep -Seconds 30
+          
+          # Verify the container app is running
+          $APP_STATUS = az containerapp show --name "$BACKEND_APP_NAME" --resource-group "$env:INPUT_RESOURCE_GROUP_NAME" --query "properties.runningStatus" -o tsv
+          Write-Host "Backend container app status: $APP_STATUS"
+          
+          Write-Host "✅ WAF workaround applied successfully"
+
       - name: Assign Contributor role to Service Principal
+        continue-on-error: true
         if: always()
         shell: bash
         env:

.github/workflows/test-automation-v2.yml

@@ -94,6 +94,8 @@ jobs:
         id: test1
         run: |
           if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
+            xvfb-run pytest -m gp --html=report/report.html --self-contained-html
+          else
             xvfb-run pytest --html=report/report.html --self-contained-html
           fi
         working-directory: tests/e2e-test
@@ -109,6 +111,8 @@ jobs:
         if: ${{ steps.test1.outcome == 'failure' }}
         run: |
           if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
+            xvfb-run pytest -m gp --html=report/report.html --self-contained-html
+          else
             xvfb-run pytest --html=report/report.html --self-contained-html
           fi
         working-directory: tests/e2e-test
@@ -124,6 +128,8 @@ jobs:
         if: ${{ steps.test2.outcome == 'failure' }}
         run: |
           if [ "${{ env.test_suite }}" == "GoldenPath-Testing" ]; then
+            xvfb-run pytest -m gp --html=report/report.html --self-contained-html
+          else
             xvfb-run pytest --html=report/report.html --self-contained-html
           fi
         working-directory: tests/e2e-test
@@ -134,7 +140,9 @@ jobs:
         if: ${{ !cancelled() }}
         with:
           name: test-report
-          path: tests/e2e-test/report/*
+          path: | 
+            tests/e2e-test/report/*
+            tests/e2e-test/screenshots/*
 
       - name: Generate E2E Test Summary
         if: always()
@@ -185,4 +193,4 @@ jobs:
             echo "### ❌ Test Results" >> $GITHUB_STEP_SUMMARY
             echo "- All test attempts failed" >> $GITHUB_STEP_SUMMARY
             echo "- Check the e2e-test/test job for detailed error information" >> $GITHUB_STEP_SUMMARY
-          fi
+          fi

tests/e2e-test/.gitignore

@@ -167,3 +167,6 @@ screenshots/
 report.html
 assets/
 .vscode/
+
+# Large SQL files (compress before committing)
+**/Large_File/*.sql