Skip to content

Commit 13a8064

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
Minor fix
1 parent 433fc64 commit 13a8064

1 file changed

Lines changed: 6 additions & 42 deletions

File tree

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

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ on:
6969
default: ''
7070
type: string
7171
existing_webapp_url:
72-
description: 'Existing WebApp URL (Skips Deployment)'
72+
description: 'Existing Container WebApp URL (Skips Deployment)'
7373
required: false
7474
default: ''
7575
type: string
7676

77-
# schedule:
78-
# - cron: '0 9,21 * * *' # Runs at 9:00 AM and 9:00 PM GMT
77+
schedule:
78+
- cron: '0 9,21 * * *' # Runs at 9:00 AM and 9:00 PM GMT
7979
env:
8080
GPT_MIN_CAPACITY: 100
8181
BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
@@ -174,7 +174,6 @@ jobs:
174174
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
175175
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
176176
echo "| **Image Tag** | \`${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY
177-
echo "| **Registry** | \`${ACR_NAME}.azurecr.io\` |" >> $GITHUB_STEP_SUMMARY
178177
echo "| **Trigger** | ${{ github.event_name }} |" >> $GITHUB_STEP_SUMMARY
179178
echo "| **Branch** | ${{ env.BRANCH_NAME }} |" >> $GITHUB_STEP_SUMMARY
180179
echo "" >> $GITHUB_STEP_SUMMARY
@@ -186,9 +185,6 @@ jobs:
186185
echo "- \`${ACR_NAME}.azurecr.io/contentprocessor:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
187186
echo "- \`${ACR_NAME}.azurecr.io/contentprocessorapi:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
188187
echo "- \`${ACR_NAME}.azurecr.io/contentprocessorweb:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY
189-
echo "" >> $GITHUB_STEP_SUMMARY
190-
echo "**Additional Tags:**" >> $GITHUB_STEP_SUMMARY
191-
echo "- All images also tagged with: \`${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}\`" >> $GITHUB_STEP_SUMMARY
192188
else
193189
echo "### ❌ Build Failed" >> $GITHUB_STEP_SUMMARY
194190
echo "- Docker build process encountered an error" >> $GITHUB_STEP_SUMMARY
@@ -460,14 +456,6 @@ jobs:
460456
fi
461457
fi
462458
463-
- name: Display Docker Image Tag
464-
run: |
465-
echo "=== Docker Image Information ==="
466-
echo "Docker Image Tag: ${{ steps.determine_image_tag.outputs.IMAGE_TAG }}"
467-
echo "Registry: ${{ secrets.ACR_TEST_LOGIN_SERVER }}"
468-
echo "Full Image: ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ steps.determine_image_tag.outputs.IMAGE_TAG }}"
469-
echo "================================"
470-
471459
- name: Deploy using azd up and extract values (${{ github.event.inputs.waf_enabled == 'true' && 'WAF' || 'Non-WAF' }}+${{ (github.event.inputs.EXP == 'true' || github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID != '' || github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID != '') && 'EXP' || 'Non-EXP' }})
472460
id: get_output
473461
run: |
@@ -530,9 +518,6 @@ jobs:
530518
azd env set AZURE_ENV_FOUNDRY_PROJECT_ID="$EXP_AI_PROJECT_ID"
531519
else
532520
echo "❌ EXP DISABLED - Skipping EXP parameters"
533-
if [[ -n "${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" ]] || [[ -n "${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" ]]; then
534-
echo "⚠️ Warning: EXP parameter values provided but EXP is disabled. These values will be ignored."
535-
fi
536521
fi
537522
538523
# Deploy using azd up
@@ -551,24 +536,6 @@ jobs:
551536
exit 1
552537
fi
553538
554-
# Extract values from azd output (adjust these based on actual output variable names)
555-
# export AI_FOUNDRY_RESOURCE_ID=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_FOUNDRY_RESOURCE_ID // empty')
556-
# echo "AI_FOUNDRY_RESOURCE_ID=$AI_FOUNDRY_RESOURCE_ID" >> $GITHUB_ENV
557-
# export AI_SEARCH_SERVICE_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_SEARCH_SERVICE_NAME // empty')
558-
# echo "AI_SEARCH_SERVICE_NAME=$AI_SEARCH_SERVICE_NAME" >> $GITHUB_ENV
559-
# export AZURE_COSMOSDB_ACCOUNT=$(echo "$DEPLOY_OUTPUT" | jq -r '.AZURE_COSMOSDB_ACCOUNT // empty')
560-
# echo "AZURE_COSMOSDB_ACCOUNT=$AZURE_COSMOSDB_ACCOUNT" >> $GITHUB_ENV
561-
# export STORAGE_ACCOUNT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_ACCOUNT_NAME // empty')
562-
# echo "STORAGE_ACCOUNT_NAME=$STORAGE_ACCOUNT_NAME" >> $GITHUB_ENV
563-
# export STORAGE_CONTAINER_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_CONTAINER_NAME // empty')
564-
# echo "STORAGE_CONTAINER_NAME=$STORAGE_CONTAINER_NAME" >> $GITHUB_ENV
565-
# export KEY_VAULT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.KEY_VAULT_NAME // empty')
566-
# echo "KEY_VAULT_NAME=$KEY_VAULT_NAME" >> $GITHUB_ENV
567-
# export RESOURCE_GROUP_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.RESOURCE_GROUP_NAME // .AZURE_RESOURCE_GROUP // empty')
568-
# [[ -z "$RESOURCE_GROUP_NAME" ]] && export RESOURCE_GROUP_NAME="$RESOURCE_GROUP_NAME"
569-
# echo "RESOURCE_GROUP_NAME=$RESOURCE_GROUP_NAME" >> $GITHUB_ENV
570-
571-
572539
# Export variables only after successful deploy
573540
export CONTAINER_API_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_FQDN // empty')"
574541
echo "CONTAINER_API_APPURL=$CONTAINER_API_APPURL" >> $GITHUB_ENV
@@ -629,7 +596,6 @@ jobs:
629596
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
630597
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
631598
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
632-
echo "| **Environment Name** | \`${{ steps.generate_env_name.outputs.ENV_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
633599
echo "| **Resource Group** | \`${{ steps.check_create_rg.outputs.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
634600
echo "| **Azure Region (Infrastructure)** | \`${{ steps.set_region.outputs.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
635601
echo "| **Azure OpenAI Region** | \`${{ steps.set_region.outputs.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
@@ -641,20 +607,19 @@ jobs:
641607
echo "" >> $GITHUB_STEP_SUMMARY
642608
if [[ "${{ job.status }}" == "success" ]]; then
643609
echo "### ✅ Deployment Details" >> $GITHUB_STEP_SUMMARY
644-
echo "- **Web App URL**: [${{ steps.get_output.outputs.CONTAINER_WEB_APPURL }}](${{ steps.get_output.outputs.CONTAINER_WEB_APPURL }})" >> $GITHUB_STEP_SUMMARY
645-
echo "- **API App URL**: [${{ env.CONTAINER_API_APPURL }}](${{ env.CONTAINER_API_APPURL }})" >> $GITHUB_STEP_SUMMARY
610+
echo "- **Container Web App URL**: [${{ steps.get_output.outputs.CONTAINER_WEB_APPURL }}](${{ steps.get_output.outputs.CONTAINER_WEB_APPURL }})" >> $GITHUB_STEP_SUMMARY
611+
echo "- **Container API App URL**: [${{ env.CONTAINER_API_APPURL }}](${{ env.CONTAINER_API_APPURL }})" >> $GITHUB_STEP_SUMMARY
646612
echo "- **Configuration**: ${{ env.WAF_ENABLED == 'true' && 'WAF' || 'Non-WAF' }}+${{ env.EXP == 'true' && 'EXP' || 'Non-EXP' }}" >> $GITHUB_STEP_SUMMARY
647613
echo "- Successfully deployed to Azure with all resources configured" >> $GITHUB_STEP_SUMMARY
648614
echo "- Schemas registered and sample data uploaded successfully" >> $GITHUB_STEP_SUMMARY
649-
echo "- Authentication disabled for web and API apps" >> $GITHUB_STEP_SUMMARY
650615
else
651616
echo "### ❌ Deployment Failed" >> $GITHUB_STEP_SUMMARY
652617
echo "- Deployment process encountered an error" >> $GITHUB_STEP_SUMMARY
653618
echo "- Check the deploy job for detailed error information" >> $GITHUB_STEP_SUMMARY
654619
fi
655620
656621
e2e-test:
657-
if: always() && ((needs.deploy.result == 'success' && needs.deploy.outputs.CONTAINER_WEB_APPURL != '') || (github.event.inputs.existing_webapp_url != '' && github.event.inputs.existing_webapp_url != null)) && (github.event_name != 'workflow_dispatch' || (github.event.inputs.run_e2e_tests != 'none' && github.event.inputs.run_e2e_tests != '' && github.event.inputs.run_e2e_tests != null))
622+
if: always() && ((needs.deploy.result == 'success' && needs.deploy.outputs.CONTAINER_WEB_APPURL != '') || (github.event.inputs.existing_webapp_url != '' && github.event.inputs.existing_webapp_url != null)) && (github.event_name != 'workflow_dispatch' || (github.event.inputs.run_e2e_tests != 'None' && github.event.inputs.run_e2e_tests != '' && github.event.inputs.run_e2e_tests != null))
658623
needs: [docker-build, deploy]
659624
uses: ./.github/workflows/test-automation-v2.yml
660625
with:
@@ -760,7 +725,6 @@ jobs:
760725
echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY
761726
echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY
762727
echo "| **Resource Group** | \`${{ env.RESOURCE_GROUP_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
763-
echo "| **Environment Name** | \`${{ env.ENV_NAME }}\` |" >> $GITHUB_STEP_SUMMARY
764728
echo "| **Azure Region (Infrastructure)** | \`${{ env.AZURE_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
765729
echo "| **Azure OpenAI Region** | \`${{ env.AZURE_ENV_OPENAI_LOCATION }}\` |" >> $GITHUB_STEP_SUMMARY
766730
echo "| **Docker Image Tag** | \`${{ env.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)