Merge pull request #430 from microsoft/fix-deploy-pipeline

fix: fix deployment pipeline

Author: Roopan-Microsoft

.github/workflows/deploy.yml

@@ -7,6 +7,10 @@ on:
     schedule:
       - cron: '0 9,21 * * *'  # Runs at 9:00 AM and 9:00 PM GMT
 
+env:
+  GPT_MIN_CAPACITY: 10
+  TEXT_EMBEDDING_MIN_CAPACITY: 10
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -30,8 +34,8 @@ jobs:
           export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
           export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
           export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          export GPT_MIN_CAPACITY="30"
-          export TEXT_EMBEDDING_MIN_CAPACITY="30"
+          export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
+          export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
           export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
 
           chmod +x scripts/checkquota.sh
@@ -114,17 +118,17 @@ jobs:
             --template-file infra/main.json \
             --parameters \
                 environmentName="${{ env.SOLUTION_PREFIX }}" \
-                secondaryLocation="eastus2" \
+                secondaryLocation="northcentralus" \
                 deploymentType="GlobalStandard" \
                 gptModelName="gpt-4o" \
                 azureOpenaiAPIVersion="2024-05-01-preview" \
-                gptDeploymentCapacity="10" \
+                gptDeploymentCapacity=${{ env.GPT_MIN_CAPACITY }} \
                 embeddingModel="text-embedding-ada-002" \
-                embeddingDeploymentCapacity="30" \
+                embeddingDeploymentCapacity=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }} \
                 imageTag="latest"
       
       - name: Extract AI Services and Key Vault Names
-        if: always()
+        if: always() && steps.check_create_rg.outcome == 'success'
         run: |
           echo "Fetching AI Services and Key Vault names before deletion..."
           
@@ -145,7 +149,7 @@ jobs:
           echo "AI_SERVICES=$AI_SERVICES" >> $GITHUB_ENV
 
       - name: Delete Bicep Deployment
-        if: success()
+        if: always()
         run: |
           set -e  
           echo "Checking if resource group exists..."
@@ -162,6 +166,7 @@ jobs:
           fi
 
       - name: Wait for Resource Deletion to Complete
+        if: always()
         run: |
           echo "Waiting for all deployed resources (including AI Services) to be deleted..."
       
@@ -289,7 +294,7 @@ jobs:
 
           EMAIL_BODY=$(cat <<EOF
           {
-            "body": "<p>Dear Team,</p><p>We would like to inform you that the Research Assistant Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
+            "body": "<p>Dear Team,</p><p>We would like to inform you that the DocGen Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
           }
           EOF
           )