Skip to content

Commit 2c27493

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
Merge branch 'main' into dev-v4
2 parents 6253433 + 5571a59 commit 2c27493

File tree

20 files changed

+1632
-969
lines changed

20 files changed

+1632
-969
lines changed

‎.flake8‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
[flake8]
22
max-line-length = 88
33
extend-ignore = E501
4-
exclude = .venv, frontend, src/backend/tests
4+
exclude =
5+
.venv,
6+
frontend,
7+
src/frontend,
8+
src/backend/tests,
9+
*.tsx,
10+
*.ts,
11+
*.jsx,
12+
*.js
513
ignore = E203, W503, G004, G200, E402

‎.github/workflows/deploy-orchestrator.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
secrets: inherit
7575

7676
deploy:
77-
if: always() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)
77+
if: "!cancelled() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)"
7878
needs: docker-build
7979
uses: ./.github/workflows/job-deploy.yml
8080
with:
@@ -94,7 +94,7 @@ jobs:
9494
secrets: inherit
9595

9696
e2e-test:
97-
if: always() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEBAPP_URL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))
97+
if: "!cancelled() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEBAPP_URL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))"
9898
needs: [docker-build, deploy]
9999
uses: ./.github/workflows/test-automation-v2.yml
100100
with:
@@ -105,7 +105,7 @@ jobs:
105105
secrets: inherit
106106

107107
send-notification:
108-
if: always()
108+
if: "!cancelled()"
109109
needs: [docker-build, deploy, e2e-test]
110110
uses: ./.github/workflows/job-send-notification.yml
111111
with:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ jobs:
329329
deploy-linux:
330330
name: Deploy on Linux
331331
needs: azure-setup
332-
if: inputs.runner_os == 'ubuntu-latest' && always() && needs.azure-setup.result == 'success'
332+
if: inputs.runner_os == 'ubuntu-latest' && !cancelled() && needs.azure-setup.result == 'success'
333333
uses: ./.github/workflows/job-deploy-linux.yml
334334
with:
335335
ENV_NAME: ${{ needs.azure-setup.outputs.ENV_NAME }}
@@ -347,7 +347,7 @@ jobs:
347347
deploy-windows:
348348
name: Deploy on Windows
349349
needs: azure-setup
350-
if: inputs.runner_os == 'windows-latest' && always() && needs.azure-setup.result == 'success'
350+
if: inputs.runner_os == 'windows-latest' && !cancelled() && needs.azure-setup.result == 'success'
351351
uses: ./.github/workflows/job-deploy-windows.yml
352352
with:
353353
ENV_NAME: ${{ needs.azure-setup.outputs.ENV_NAME }}

‎.github/workflows/job-send-notification.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ jobs:
192192
193193
EMAIL_BODY=$(cat <<EOF
194194
{
195-
"body": "<p>Dear Team,</p><p>The ${{ env.accelerator_name }} pipeline executed against the <strong>existing WebApp URL</strong> and testing process has completed successfully.</p><p><strong>Test Results:</strong><br>• Status: ✅ Passed<br>• Test Suite: ${TEST_SUITE_NAME}<br>${TEST_REPORT_URL:+• Test Report: <a href='${TEST_REPORT_URL}'>View Report</a>}<br>• Target URL: <a href='${EXISTING_URL}'>${EXISTING_URL}</a></p><p><strong>Deployment:</strong> Skipped</p><p><strong>Run URL:</strong> <a href='${RUN_URL}'>${RUN_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
196-
"subject": "${{ env.accelerator_name }} Pipeline - Test Automation Passed (Existing URL)"
195+
"body": "<p>Dear Team,</p><p>The ${{ env.accelerator_name }} pipeline executed against the <strong>specified target URL</strong> and testing process has completed successfully.</p><p><strong>Test Results:</strong><br>• Status: ✅ Passed<br>• Test Suite: ${TEST_SUITE_NAME}<br>${TEST_REPORT_URL:+• Test Report: <a href='${TEST_REPORT_URL}'>View Report</a>}<br>• Target URL: <a href='${EXISTING_URL}'>${EXISTING_URL}</a></p><p><strong>Deployment:</strong> Skipped</p><p><strong>Run URL:</strong> <a href='${RUN_URL}'>${RUN_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
196+
"subject": "${{ env.accelerator_name }} Pipeline - Test Automation Passed "
197197
}
198198
EOF
199199
)
@@ -213,8 +213,8 @@ jobs:
213213
214214
EMAIL_BODY=$(cat <<EOF
215215
{
216-
"body": "<p>Dear Team,</p><p>The ${{ env.accelerator_name }} pipeline executed against the <strong>existing WebApp URL</strong> and the test automation has encountered issues and failed to complete successfully.</p><p><strong>Failure Details:</strong><br>• Target URL: <a href='${EXISTING_URL}'>${EXISTING_URL}</a><br>${TEST_REPORT_URL:+• Test Report: <a href='${TEST_REPORT_URL}'>View Report</a>}<br>• Test Suite: ${TEST_SUITE_NAME}<br>• Deployment: Skipped</p><p><strong>Run URL:</strong> <a href='${RUN_URL}'>${RUN_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
217-
"subject": "${{ env.accelerator_name }} Pipeline - Test Automation Failed (Existing URL)"
216+
"body": "<p>Dear Team,</p><p>The ${{ env.accelerator_name }} pipeline executed against the <strong>specified target URL</strong> and the test automation has encountered issues and failed to complete successfully.</p><p><strong>Failure Details:</strong><br>• Target URL: <a href='${EXISTING_URL}'>${EXISTING_URL}</a><br>${TEST_REPORT_URL:+• Test Report: <a href='${TEST_REPORT_URL}'>View Report</a>}<br>• Test Suite: ${TEST_SUITE_NAME}<br>• Deployment: Skipped</p><p><strong>Run URL:</strong> <a href='${RUN_URL}'>${RUN_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
217+
"subject": "${{ env.accelerator_name }} Pipeline - Test Automation Failed "
218218
}
219219
EOF
220220
)

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ jobs:
9191
- name: Run tests(1)
9292
id: test1
9393
run: |
94-
xvfb-run pytest --headed --html=report/report.html --self-contained-html
94+
if [ "${{ inputs.TEST_SUITE }}" == "GoldenPath-Testing" ]; then
95+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
96+
else
97+
xvfb-run pytest --html=report/report.html --self-contained-html
98+
fi
9599
working-directory: tests/e2e-test
96100
continue-on-error: true
97101

@@ -104,7 +108,11 @@ jobs:
104108
id: test2
105109
if: ${{ steps.test1.outcome == 'failure' }}
106110
run: |
107-
xvfb-run pytest --headed --html=report/report.html --self-contained-html
111+
if [ "${{ inputs.TEST_SUITE }}" == "GoldenPath-Testing" ]; then
112+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
113+
else
114+
xvfb-run pytest --html=report/report.html --self-contained-html
115+
fi
108116
working-directory: tests/e2e-test
109117
continue-on-error: true
110118

@@ -117,7 +125,11 @@ jobs:
117125
id: test3
118126
if: ${{ steps.test2.outcome == 'failure' }}
119127
run: |
120-
xvfb-run pytest --headed --html=report/report.html --self-contained-html
128+
if [ "${{ inputs.TEST_SUITE }}" == "GoldenPath-Testing" ]; then
129+
xvfb-run pytest -m gp --html=report/report.html --self-contained-html
130+
else
131+
xvfb-run pytest --html=report/report.html --self-contained-html
132+
fi
121133
working-directory: tests/e2e-test
122134

123135
- name: Upload test report

‎docs/ACRBuildAndPushGuide.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,29 @@ If you want to update image tag and image manually you can follow below steps:
7474
![alt text](./images/AppServiceContainer.png)
7575

7676

77+
**MCP Server :**
78+
79+
```bash
80+
az acr login --name <containerregname>
81+
docker build --no-cache -f src/mcp_server/Dockerfile -t <acrloginserver>/<repo>:<tagname> ./src/mcp_server
82+
docker push <acrloginserver>/<repo>:<tagname>
83+
```
84+
85+
If you want to update image tag and image manually you can follow below steps:
86+
- Go to your **Container App** in the [Azure Portal](https://portal.azure.com/#home).
87+
- In the left menu, select **Containers**.
88+
- Under your container, update:
89+
90+
- Image source → Azure Container Registry / Docker Hub.
91+
92+
- Image name → myapp/mcp.
93+
94+
- Tag → change to the new one you pushed (e.g., v2).
95+
96+
- Click **Save** → this will create a new revision automatically with the updated image.
97+
98+
![alt text](./images/mcpContainer.png)
99+
77100
## ✅ Verification
78101

79102
Run the following command to verify that images were pushed successfully:

0 commit comments

Comments
 (0)