Merge pull request #739 from microsoft/deployment-pipelinev4

ci: Update deployment workflows for version 4 compatibility

Author: Prajwal-Microsoft

.github/workflows/deploy-linux.yml

@@ -1,12 +1,12 @@
 name: Deploy-Test-Cleanup (v2) Linux
 on:
   workflow_run:
-    workflows: ["Build Docker and Optional Push v3"]
+    workflows: ["Build Docker and Optional Push v4"]
     types:
       - completed
     branches:
       - main
-      - dev-v3
+      - dev-v4
       - hotfix
   workflow_dispatch:
     inputs:

.github/workflows/deploy-orchestrator.yml

@@ -124,7 +124,7 @@ jobs:
     secrets: inherit
 
   cleanup-deployment:
-    if: always() && needs.deploy.result == 'success' && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)
+    if: "!cancelled() && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)"
     needs: [docker-build, deploy, e2e-test]
     uses: ./.github/workflows/job-cleanup-deployment.yml
     with:

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

@@ -184,7 +184,8 @@ jobs:
           export AZURE_ENV_NAME="${{ steps.get_output_linux.outputs.AZURE_ENV_NAME }}"
           
           # Upload team configurations and index sample data in one step
-          bash infra/scripts/team_config_and_data.sh "${{ inputs.RESOURCE_GROUP_NAME }}"
+          # Automatically select "6" (All use cases) for non-interactive deployment
+          echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
 
       - name: Generate Deployment Summary
         if: always()

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

@@ -179,8 +179,9 @@ jobs:
           $env:AZURE_AI_SEARCH_INDEX_NAME = "sample-dataset-index"
           $env:AZURE_ENV_NAME = "${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}"
 
-          # Run the script (PowerShell version)
-          & infra\scripts\Team-Config-And-Data.ps1 "${{ inputs.RESOURCE_GROUP_NAME }}"
+          # Upload team configurations and index sample data in one step
+          # Automatically select "6" (All use cases) for non-interactive deployment
+          bash -c "echo 6 | pwsh -File infra/scripts/Selecting-Team-Config-And-Data.ps1"
 
       - name: Generate Deployment Summary
         if: always()

.github/workflows/job-deploy.yml

@@ -266,13 +266,13 @@ jobs:
             echo "Current branch: $BRANCH_NAME"
             
             if [[ "$BRANCH_NAME" == "main" ]]; then
-              IMAGE_TAG="latest_v3"
-            elif [[ "$BRANCH_NAME" == "dev-v3" ]]; then
-              IMAGE_TAG="dev_v3"
+              IMAGE_TAG="latest_v4"
+            elif [[ "$BRANCH_NAME" == "dev-v4" ]]; then
+              IMAGE_TAG="dev-v4"
             elif [[ "$BRANCH_NAME" == "hotfix" ]]; then
               IMAGE_TAG="hotfix"
             else
-              IMAGE_TAG="latest_v3"
+              IMAGE_TAG="latest_v4"
             fi
             echo "Using existing Docker image tag: $IMAGE_TAG"
           fi

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

@@ -31,7 +31,7 @@ env:
     MACAE_WEB_URL: ${{ inputs.MACAE_WEB_URL }}
     MACAE_URL_API: ${{ inputs.MACAE_URL_API }}
     MACAE_RG: ${{ inputs.MACAE_RG }}
-    accelerator_name: "MACAE v3"
+    accelerator_name: "MACAE v4"
 
 jobs:
   test: