From cec9d730ac23b5abc23e58ffb40354f1f36e0633 Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Tue, 7 Oct 2025 18:06:12 +0530 Subject: [PATCH 1/5] Remove e2e code block from deploy.yml file --- .github/workflows/deploy.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ca921566..baeba4b4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -181,20 +181,9 @@ jobs: echo "SUCCESS=false" >> $GITHUB_OUTPUT fi - e2e-test: - needs: deploy - if: needs.deploy.outputs.DEPLOYMENT_SUCCESS == 'true' - uses: ./.github/workflows/test-automation.yml - with: - MACAE_WEB_URL: ${{ needs.deploy.outputs.WEBAPP_URL }} - MACAE_URL_API: ${{ needs.deploy.outputs.MACAE_URL_API }} - MACAE_RG: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }} - MACAE_CONTAINER_APP: ${{ needs.deploy.outputs.CONTAINER_APP }} - secrets: inherit - cleanup-deployment: if: always() && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' - needs: [deploy, e2e-test] + needs: [deploy] runs-on: ubuntu-latest env: RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }} From e2cdecf4fcb7a4b2131e9e3d393c1b22c1d4a834 Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Tue, 7 Oct 2025 18:28:36 +0530 Subject: [PATCH 2/5] update capacity --- .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 baeba4b4..e251eca4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -140,7 +140,7 @@ jobs: backendContainerImageTag="${IMAGE_TAG}" \ frontendContainerImageTag="${IMAGE_TAG}" \ azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \ - gptModelCapacity=150 \ + gptModelCapacity=1 \ createdBy="Pipeline" \ tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \ --output json From a904b510beec65b220bcc19c2f2f0b1ed24dbafd Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Tue, 7 Oct 2025 18:31:41 +0530 Subject: [PATCH 3/5] update capacity-1 --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e251eca4..c86e385b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ on: - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT workflow_dispatch: #Allow manual triggering env: - GPT_MIN_CAPACITY: 150 + GPT_MIN_CAPACITY: 1 BRANCH_NAME: ${{ github.head_ref || github.ref_name }} jobs: @@ -36,7 +36,7 @@ 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="150" + export GPT_MIN_CAPACITY="1" export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}" chmod +x infra/scripts/checkquota.sh From 303748c243f448c78539688f5987c8ac208c6e39 Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Tue, 7 Oct 2025 18:39:11 +0530 Subject: [PATCH 4/5] update output --- .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 c86e385b..b017f489 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -143,7 +143,7 @@ jobs: gptModelCapacity=1 \ createdBy="Pipeline" \ tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \ - --output json + --output none || { echo "Deployment failed"; exit 1; } - name: Extract Web App and API App URLs id: get_output From caf2c71dd80e51a15d87f2bcdabb3f5b6d345793 Mon Sep 17 00:00:00 2001 From: NirajC-Microsoft Date: Tue, 7 Oct 2025 18:44:05 +0530 Subject: [PATCH 5/5] Update deployment output format to JSON Change deployment output format from none to json. --- .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 b017f489..c86e385b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -143,7 +143,7 @@ jobs: gptModelCapacity=1 \ createdBy="Pipeline" \ tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \ - --output none || { echo "Deployment failed"; exit 1; } + --output json - name: Extract Web App and API App URLs id: get_output