Merge pull request #741 from NirajC-Microsoft/dev-v4

refactor: Update reference in GitHub Actions for MACAE V4

Author: Roopan-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.yml

@@ -126,7 +126,7 @@ jobs:
           elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
             IMAGE_TAG="hotfix"
           else
-            IMAGE_TAG="latest_v3"
+            IMAGE_TAG="latest_v4"
           fi
 
           # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
@@ -183,28 +183,9 @@ jobs:
 
           echo "Running post-deployment script..."
           
-          # Extract required resource names from the deployment
-          STORAGE_ACCOUNT=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.Storage/storageAccounts" --query "[0].name" -o tsv)
-          AI_SEARCH=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.Search/searchServices" --query "[0].name" -o tsv)
-          
-          echo "Found Storage Account: $STORAGE_ACCOUNT"
-          echo "Found AI Search Service: $AI_SEARCH"
-          echo "Backend URL: ${{ steps.get_backend_url.outputs.MACAE_URL_API }}"
-          
-          # Run upload team config script with parameters
-          bash infra/scripts/upload_team_config.sh \
-            "${{ steps.get_backend_url.outputs.MACAE_URL_API }}" \
-            "data/agent_teams" \
-            "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          
-          # Run process sample data script with parameters
-          bash infra/scripts/process_sample_data.sh \
-            "$STORAGE_ACCOUNT" \
-            "sample-dataset" \
-            "$AI_SEARCH" \
-            "sample-dataset-index" \
-            "${{ env.RESOURCE_GROUP_NAME }}" \
-            "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+          # 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 }}"
 
           echo "=== Post-Deployment Script Completed Successfully ==="
 

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

@@ -173,7 +173,7 @@ jobs:
           set -e
           az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
 
-          # Set environment variables for team_config_and_data.sh
+          # Set environment variables for selecting_team_config_and_data.sh
           export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
           export AZURE_RESOURCE_GROUP="${{ inputs.RESOURCE_GROUP_NAME }}"
           export BACKEND_URL="${{ steps.get_output_linux.outputs.BACKEND_URL }}"
@@ -184,8 +184,10 @@ 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 }}"
-
+          # 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 }}"
+          
       - name: Generate Deployment Summary
         if: always()
         shell: bash

.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/job-send-notification.yml

@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
-      accelerator_name: "MACAE V3"
+      accelerator_name: "MACAE V4"
     steps:
       - name: Determine Test Suite Display Name
         id: test_suite

.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:

.github/workflows/test-automation.yml

@@ -31,7 +31,7 @@ jobs:
       MACAE_URL_API: ${{ inputs.MACAE_URL_API }}
       MACAE_RG: ${{ inputs.MACAE_RG }}
       MACAE_CONTAINER_APP: ${{ inputs.MACAE_CONTAINER_APP }}
-      accelerator_name: "MACAE v3"
+      accelerator_name: "MACAE v4"
 
     steps:
       - name: Checkout repository