Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
2be752c
edit
Kanchan-Microsoft Jul 3, 2025
45b791b
edit
Kanchan-Microsoft Jul 3, 2025
dd87813
updated deploy-waf
Kanchan-Microsoft Jul 4, 2025
f7ad2c2
edit
Kanchan-Microsoft Jul 4, 2025
aa98299
changed api version
Kanchan-Microsoft Jul 4, 2025
d039b91
edit1
Kanchan-Microsoft Jul 4, 2025
b0e74c9
edit1
Kanchan-Microsoft Jul 4, 2025
ffa63e6
edit
Kanchan-Microsoft Jul 7, 2025
10ef654
edit
Kanchan-Microsoft Jul 7, 2025
229500e
edit
Kanchan-Microsoft Jul 7, 2025
78432fe
edit
Kanchan-Microsoft Jul 7, 2025
9936f27
edit
Kanchan-Microsoft Jul 8, 2025
2d5d447
edit
Kanchan-Microsoft Jul 8, 2025
b2de79b
edit
Kanchan-Microsoft Jul 8, 2025
b0ef25a
update
Kanchan-Microsoft Jul 9, 2025
478f690
update
Kanchan-Microsoft Jul 9, 2025
6313547
update
Kanchan-Microsoft Jul 9, 2025
fafb7bf
update
Kanchan-Microsoft Jul 9, 2025
4ed85f1
edit
Kanchan-Microsoft Jul 9, 2025
9629d00
edit
Kanchan-Microsoft Jul 9, 2025
b5ad293
update
Kanchan-Microsoft Jul 9, 2025
12d46db
edit
Kanchan-Microsoft Jul 9, 2025
e99a1cd
Update deploy.yml
Kanchan-Microsoft Jul 9, 2025
03c56cf
Update test-automation.yml
Harmanpreet-Microsoft Jul 9, 2025
b8d8cd8
Update deploy.yml
Harmanpreet-Microsoft Jul 9, 2025
a37ea77
updated deploy.yml
Kanchan-Microsoft Jul 9, 2025
ed9debd
Merge branch 'hotfix' of https://github.com/Kanchan-Microsoft/Multi-A…
Kanchan-Microsoft Jul 9, 2025
39b03b3
updated test-automation
Kanchan-Microsoft Jul 9, 2025
245e703
Update deploy.yml1
Harmanpreet-Microsoft Jul 9, 2025
49ed5cb
Update deploy.yml2
Harmanpreet-Microsoft Jul 9, 2025
29f9e96
Update test-automation.yml1
Harmanpreet-Microsoft Jul 9, 2025
02153f0
Update deploy.yml3
Harmanpreet-Microsoft Jul 9, 2025
305e738
edit
Kanchan-Microsoft Jul 9, 2025
be89d9a
Update test-automation.yml5
Harmanpreet-Microsoft Jul 9, 2025
73edca4
update
Kanchan-Microsoft Jul 9, 2025
15edb3b
update
Kanchan-Microsoft Jul 9, 2025
8a2fcfc
edit
Kanchan-Microsoft Jul 9, 2025
a9d1b21
Update test-automation.yml
Harmanpreet-Microsoft Jul 9, 2025
b263202
edit1
Kanchan-Microsoft Jul 9, 2025
5428e72
Update test-automation.yml4
Harmanpreet-Microsoft Jul 9, 2025
4e6850a
Update deploy.yml5
Harmanpreet-Microsoft Jul 9, 2025
4aee56e
Update deploy.yml9
Harmanpreet-Microsoft Jul 9, 2025
50939de
Update constants.py
Harmanpreet-Microsoft Jul 9, 2025
a23ae16
edit1
Kanchan-Microsoft Jul 9, 2025
92e2b61
Merge branch 'hotfix' of https://github.com/Kanchan-Microsoft/Multi-A…
Kanchan-Microsoft Jul 9, 2025
f1fec95
updated deploy-waf
Kanchan-Microsoft Jul 9, 2025
33d56ee
updated e2e tests
Kanchan-Microsoft Jul 10, 2025
c9a59ab
updated requirements.txt
Kanchan-Microsoft Jul 10, 2025
8da81e5
edit
Kanchan-Microsoft Jul 10, 2025
a12740e
edit
Kanchan-Microsoft Jul 10, 2025
a675c61
commented cleanup deployment
Kanchan-Microsoft Jul 10, 2025
84d0d43
Update deploy.yml
Harmanpreet-Microsoft Jul 10, 2025
5bc07d3
update
Kanchan-Microsoft Jul 10, 2025
84951bb
Merge branch 'hotfix' of https://github.com/Kanchan-Microsoft/Multi-A…
Kanchan-Microsoft Jul 10, 2025
134e147
uncommented cleanup deployment
Kanchan-Microsoft Jul 10, 2025
c5c102c
update
Kanchan-Microsoft Jul 10, 2025
298115c
edit
Kanchan-Microsoft Jul 10, 2025
0d74aef
edit
Kanchan-Microsoft Jul 10, 2025
4c4685b
edit
Kanchan-Microsoft Jul 10, 2025
75af1fe
edit
Kanchan-Microsoft Jul 10, 2025
80440ba
Merge branch 'dev' into hotfix
Kanchan-Microsoft Jul 11, 2025
5669000
edit
Kanchan-Microsoft Jul 11, 2025
c6e3806
edit
Kanchan-Microsoft Jul 11, 2025
4ef14b1
edit
Kanchan-Microsoft Jul 11, 2025
4c2c0ad
edit
Kanchan-Microsoft Jul 11, 2025
cd29617
edit
Kanchan-Microsoft Jul 11, 2025
c8fd0e5
edit
Kanchan-Microsoft Jul 11, 2025
e4fb178
edit
Kanchan-Microsoft Jul 11, 2025
ee20734
edit
Kanchan-Microsoft Jul 11, 2025
1629f89
edit
Kanchan-Microsoft Jul 11, 2025
e2f7f72
Delete infra/main.json
Kanchan-Microsoft Jul 11, 2025
3363588
ci: enhance MACAE deployment and testing workflows
Avijit-Microsoft Jul 11, 2025
af9e5b5
Bug fix of #20489
Ravikirana-Microsoft Jul 11, 2025
ee6daf4
build error fix
Ravikirana-Microsoft Jul 11, 2025
5affea6
Merge pull request #321 from microsoft/macae-bu-fixes
Roopan-Microsoft Jul 11, 2025
64203ff
test: MACAE_Updated_locator_send_button
Ritesh-Microsoft Jul 11, 2025
ea8b266
Merge branch 'dev' of https://github.com/Ritesh-Microsoft/MACAE_test_…
Ritesh-Microsoft Jul 11, 2025
847baa7
test: MACAE_updated_Locator_send_button
Ritesh-Microsoft Jul 11, 2025
a7426da
test: MACAE_updated_Locator_send_button
Avijit-Microsoft Jul 11, 2025
9844255
Merge branch 'main' into dev
Roopan-Microsoft Jul 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions .github/workflows/deploy-waf.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Validate WAF Deployment
name: Validate WAF Deployment

on:
push:
branches:
- main
schedule:
- cron: '0 11,23 * * *' # Runs at 11:00 AM and 11:00 PM GMT
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT

jobs:
deploy:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Set Deployment Region
run: |
echo "Selected Region: $VALID_REGION"
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV

- name: Setup Azure CLI
run: |
Expand All @@ -77,8 +77,7 @@ jobs:
SHORT_UUID=$(uuidgen | cut -d'-' -f1)
UNIQUE_RG_NAME="arg-${ACCL_NAME}-${SHORT_UUID}"
echo "RESOURCE_GROUP_NAME=${UNIQUE_RG_NAME}" >> $GITHUB_ENV
echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"

echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"

- name: Check and Create Resource Group
id: check_create_rg
Expand All @@ -93,7 +92,6 @@ jobs:
echo "Resource group already exists."
fi


- name: Deploy Bicep Template
id: deploy
run: |
Expand All @@ -113,29 +111,28 @@ jobs:
if: failure()
run: |
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

# Construct the email body
EMAIL_BODY=$(cat <<EOF
{
"body": "<p>Dear Team,</p><p>We would like to inform you that the Multi-Agent-Custom-Automation-Engine-Solution-Accelerator Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
}
EOF
)

# Send the notification
curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
-H "Content-Type: application/json" \
-d "$EMAIL_BODY" || echo "Failed to send notification"



- name: Get OpenAI Resource from Resource Group
id: get_openai_resource
run: |


set -e
echo "Fetching OpenAI resource from resource group ${{ env.RESOURCE_GROUP_NAME }}..."

# Run the az resource list command to get the OpenAI resource name
openai_resource_name=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.CognitiveServices/accounts" --query "[0].name" -o tsv)

Expand All @@ -147,9 +144,6 @@ jobs:
echo "OpenAI resource name: ${openai_resource_name}"
fi




- name: Delete Bicep Deployment
if: always()
run: |
Expand All @@ -167,11 +161,10 @@ jobs:
echo "Resource group does not exists."
fi


- name: Wait for resource deletion to complete
run: |


# Add resources to the array
resources_to_check=("${{ env.OPENAI_RESOURCE_NAME }}")

Expand Down Expand Up @@ -219,7 +212,6 @@ jobs:
fi
done


- name: Purging the Resources
if: always()
run: |
Expand Down
Loading
Loading