Skip to content

fix: remove e2e code block from deploy.yml #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: fix: dev-v3 to main branch merge
merged 5 commits into from
Oct 7, 2025
Merged

fix: remove e2e code block from deploy.yml #551

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cec9d73
Remove e2e code block from deploy.yml file
NirajC-Microsoft Oct 7, 2025
e2cdecf
update capacity
NirajC-Microsoft Oct 7, 2025
a904b51
update capacity-1
NirajC-Microsoft Oct 7, 2025
303748c
update output
NirajC-Microsoft Oct 7, 2025
caf2c71
Update deployment output format to JSON
NirajC-Microsoft Oct 7, 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
19 changes: 4 additions & 15 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
Loading