Merge branch 'main' into dev-v4

Author: Prajwal-Microsoft

.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,10 +184,9 @@ jobs:
           export AZURE_ENV_NAME="${{ steps.get_output_linux.outputs.AZURE_ENV_NAME }}"
           
           # Upload team configurations and index sample data in one step
-          # Run PowerShell script with 'All' use case automatically selected
-          # Provide two inputs: '1' for keeping current subscription, '5' for All use cases
-          echo -e "1\n5" | pwsh -File infra/scripts/Selecting-Team-Config-And-Data.ps1 -ResourceGroup "${{ env.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()
         shell: bash

.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

@@ -268,7 +268,7 @@ jobs:
             if [[ "$BRANCH_NAME" == "main" ]]; then
               IMAGE_TAG="latest_v4"
             elif [[ "$BRANCH_NAME" == "dev-v4" ]]; then
-              IMAGE_TAG="dev_v4"
+              IMAGE_TAG="dev-v4"
             elif [[ "$BRANCH_NAME" == "hotfix" ]]; then
               IMAGE_TAG="hotfix"
             else