From 9682e6a07110bd4c6951697653a594a0a7bea1b0 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 2 Sep 2025 11:55:35 +0530 Subject: [PATCH 1/5] Update quota_check.md to include infra directory step Added a step to navigate to the 'infra' directory before accessing the 'scripts' folder. --- docs/quota_check.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/quota_check.md b/docs/quota_check.md index f8cae1a5b..61a70dbbd 100644 --- a/docs/quota_check.md +++ b/docs/quota_check.md @@ -79,6 +79,7 @@ The final table lists regions with available quota. You can select any of these ![git_bash](images/git_bash.png) 3. Navigate to the `scripts` folder where the script files are located and make the script as executable: ```sh + cd infra cd scripts chmod +x quota_check_params.sh ``` From 8c39455f8cce7512231a038e538e20fb6defbf88 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Thu, 4 Sep 2025 21:15:26 +0530 Subject: [PATCH 2/5] Update image tags for backend and frontend containers --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 82f0941b1..7576db51d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -134,7 +134,8 @@ jobs: gptModelDeploymentType="GlobalStandard" \ gptModelName="gpt-4o" \ gptModelVersion="2024-08-06" \ - imageTag="${IMAGE_TAG}" \ + backendContainerImageTag="${IMAGE_TAG}" \ + frontendContainerImageTag="${IMAGE_TAG}" \ azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \ gptModelCapacity=150 \ --output json From 7169d8c9b60e832a30518c12d7b7b8ed708f452a Mon Sep 17 00:00:00 2001 From: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Date: Tue, 30 Sep 2025 02:23:14 +0530 Subject: [PATCH 3/5] Update deploy.yml --- .github/workflows/deploy.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 36fe44763..58b0e3a10 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Validate Deployment +name: Validate Deployment v2 on: workflow_run: @@ -6,8 +6,7 @@ on: types: - completed branches: - - main - - hotfix + - macae-v2 - dev schedule: - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT @@ -115,19 +114,16 @@ jobs: - name: Deploy Bicep Template id: deploy run: | - if [[ "${{ env.BRANCH_NAME }}" == "main" ]]; then + if [[ "${{ env.BRANCH_NAME }}" == "macae-v2" ]]; then IMAGE_TAG="latest" elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then IMAGE_TAG="dev" - elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then - IMAGE_TAG="hotfix" - else - IMAGE_TAG="latest" + # elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then + # IMAGE_TAG="hotfix" + # else + # IMAGE_TAG="latest" fi - # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ - current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ") - az deployment group create \ --resource-group ${{ env.RESOURCE_GROUP_NAME }} \ --template-file infra/main.bicep \ @@ -142,7 +138,6 @@ jobs: azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \ gptModelCapacity=150 \ createdBy="Pipeline" \ - tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \ --output json - name: Extract Web App and API App URLs From 54e0435e1996ae92f87cc4a5449ec6cb4689dbe1 Mon Sep 17 00:00:00 2001 From: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Date: Tue, 30 Sep 2025 02:25:00 +0530 Subject: [PATCH 4/5] Update WAF deployment workflow for new branch and version --- .github/workflows/deploy-waf.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-waf.yml b/.github/workflows/deploy-waf.yml index 2b85b5c56..1726747b1 100644 --- a/.github/workflows/deploy-waf.yml +++ b/.github/workflows/deploy-waf.yml @@ -1,9 +1,9 @@ -name: Validate WAF Deployment +name: Validate WAF Deployment v2 on: push: branches: - - main + - macae-v2 schedule: - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT @@ -105,9 +105,6 @@ jobs: id: deploy run: | set -e - # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ - current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ") - az deployment group create \ --resource-group ${{ env.RESOURCE_GROUP_NAME }} \ --template-file infra/main.bicep \ @@ -121,7 +118,6 @@ jobs: enablePrivateNetworking=true \ enableScalability=true \ createdBy="Pipeline" \ - tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" - name: Send Notification on Failure From c56cbc62abfdc1d91c10dc8cd9f7061898728e26 Mon Sep 17 00:00:00 2001 From: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Date: Tue, 30 Sep 2025 02:27:46 +0530 Subject: [PATCH 5/5] Update deploy.yml for workflow_dispatch comment --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 58b0e3a10..c8ec74fc3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ on: - dev schedule: - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT - workflow_dispatch: #Allow manual triggering + workflow_dispatch: #Allow manual triggering. env: GPT_MIN_CAPACITY: 150 BRANCH_NAME: ${{ github.head_ref || github.ref_name }}