Skip to content

Commit 70a2d6f

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
authored
Merge pull request #519 from microsoft/dev
chore: Dev to Main merge
2 parents b87a14b + 8494f46 commit 70a2d6f

16 files changed

+669
-140
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ on:
7474
- 'Smoke-Testing'
7575
- 'None'
7676

77-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
78-
description: 'Log Analytics Workspace ID (Optional)'
77+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
78+
description: 'Log Analytics Workspace Resource ID (Optional)'
7979
required: false
8080
default: ''
8181
type: string
@@ -107,7 +107,7 @@ jobs:
107107
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
108108
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
109109
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
110-
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
110+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ steps.validate.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
111111
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
112112
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
113113
steps:
@@ -122,7 +122,7 @@ jobs:
122122
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
123123
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
124124
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
125-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
125+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
126126
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
127127
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
128128
run: |
@@ -199,18 +199,18 @@ jobs:
199199
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
200200
fi
201201
202-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
203-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
204-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
205-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
202+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
203+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
204+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
205+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
206206
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
207-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
207+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
208208
VALIDATION_FAILED=true
209209
else
210-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
210+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
211211
fi
212212
else
213-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
213+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
214214
fi
215215
216216
# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
@@ -258,7 +258,7 @@ jobs:
258258
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
259259
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
260260
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
261-
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
261+
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
262262
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
263263
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
264264
@@ -275,7 +275,7 @@ jobs:
275275
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
276276
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
277277
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
278-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
278+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID || '' }}
279279
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
280280
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
281281
trigger_type: ${{ github.event_name }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ on:
4242
required: false
4343
default: 'GoldenPath-Testing'
4444
type: string
45-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
46-
description: 'Log Analytics Workspace ID (Optional)'
45+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
46+
description: 'Log Analytics Workspace Resource ID (Optional)'
4747
required: false
4848
default: ''
4949
type: string
@@ -88,7 +88,7 @@ jobs:
8888
EXP: ${{ inputs.EXP }}
8989
build_docker_image: ${{ inputs.build_docker_image }}
9090
existing_webapp_url: ${{ inputs.existing_webapp_url }}
91-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
91+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
9292
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
9393
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
9494
run_e2e_tests: ${{ inputs.run_e2e_tests }}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ on:
5757
- 'Smoke-Testing'
5858
- 'None'
5959

60-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
61-
description: 'Log Analytics Workspace ID (Optional)'
60+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
61+
description: 'Log Analytics Workspace Resource ID (Optional)'
6262
required: false
6363
default: ''
6464
type: string
@@ -90,7 +90,7 @@ jobs:
9090
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
9191
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
9292
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
93-
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
93+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ steps.validate.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
9494
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
9595
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
9696
steps:
@@ -105,7 +105,7 @@ jobs:
105105
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
106106
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
107107
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
108-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
108+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
109109
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
110110
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
111111
run: |
@@ -182,18 +182,18 @@ jobs:
182182
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
183183
fi
184184
185-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
186-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
187-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
188-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
185+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
186+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
187+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
188+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
189189
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
190-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
190+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
191191
VALIDATION_FAILED=true
192192
else
193-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
193+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
194194
fi
195195
else
196-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
196+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
197197
fi
198198
199199
# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
@@ -241,7 +241,7 @@ jobs:
241241
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
242242
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
243243
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
244-
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
244+
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
245245
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
246246
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
247247
@@ -258,7 +258,7 @@ jobs:
258258
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
259259
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
260260
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
261-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
261+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ needs.validate-inputs.outputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID || '' }}
262262
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
263263
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
264264
trigger_type: ${{ github.event_name }}

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ jobs:
147147
enablePrivateNetworking="false" \
148148
contentUnderstandingLocation="WestUS" \
149149
deploymentType="GlobalStandard" \
150-
gptModelName="gpt-4o" \
151-
gptModelVersion="2024-08-06" \
152-
gptDeploymentCapacity="30" \
153-
aiServiceLocation="${{ env.AZURE_LOCATION }}" \
150+
gptModelName="gpt-5.1" \
151+
gptModelVersion="2025-11-13" \
152+
gptDeploymentCapacity="300" \
153+
azureAiServiceLocation="${{ env.AZURE_LOCATION }}" \
154154
imageTag="latest_v2" \
155155
tags="{'CreatedBy':'Pipeline', 'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
156156
--query "properties.outputs" -o json); then

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
required: false
2929
type: string
3030
default: "false"
31-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
31+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
3232
required: false
3333
type: string
3434
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
@@ -60,7 +60,7 @@ jobs:
6060
INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
6161
INPUT_EXP: ${{ inputs.EXP }}
6262
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
63-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
63+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
6464
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
6565
run: |
6666
echo "🔍 Validating workflow input parameters..."
@@ -148,15 +148,15 @@ jobs:
148148
echo "✅ WAF_ENABLED: '$INPUT_WAF_ENABLED' is valid"
149149
fi
150150
151-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, if provided must be valid Resource ID)
152-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
153-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
154-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
151+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, if provided must be valid Resource ID)
152+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
153+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
154+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
155155
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
156-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
156+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
157157
VALIDATION_FAILED=true
158158
else
159-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
159+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
160160
fi
161161
fi
162162
@@ -219,7 +219,7 @@ jobs:
219219
IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
220220
BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }}
221221
EXP: ${{ inputs.EXP }}
222-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
222+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
223223
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
224224
run: |
225225
set -e
@@ -239,10 +239,10 @@ jobs:
239239
240240
# Set additional parameters
241241
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
242-
azd env set AZURE_ENV_AI_DEPLOYMENTS_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
242+
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
243243
azd env set AZURE_LOCATION="$AZURE_LOCATION"
244244
azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
245-
azd env set AZURE_ENV_CONTAINER_IMAGE_TAG="$IMAGE_TAG"
245+
azd env set AZURE_ENV_IMAGETAG="$IMAGE_TAG"
246246
247247
if [[ "$BUILD_DOCKER_IMAGE" == "true" ]]; then
248248
ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
@@ -255,8 +255,8 @@ jobs:
255255
if [[ "$EXP" == "true" ]]; then
256256
echo "✅ EXP ENABLED - Setting EXP parameters..."
257257
258-
if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
259-
EXP_LOG_ANALYTICS_ID="$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID"
258+
if [[ -n "$AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
259+
EXP_LOG_ANALYTICS_ID="$AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID"
260260
else
261261
EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
262262
fi
@@ -267,10 +267,10 @@ jobs:
267267
EXP_AI_PROJECT_ID="${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_ID }}"
268268
fi
269269
270-
echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID"
271-
echo "AZURE_ENV_FOUNDRY_PROJECT_ID: $EXP_AI_PROJECT_ID"
272-
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="$EXP_LOG_ANALYTICS_ID"
273-
azd env set AZURE_ENV_FOUNDRY_PROJECT_ID="$EXP_AI_PROJECT_ID"
270+
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"
271+
echo "AZURE_EXISTING_AIPROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID"
272+
azd env set AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID"
273+
azd env set AZURE_EXISTING_AIPROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID"
274274
else
275275
echo "❌ EXP DISABLED - Skipping EXP parameters"
276276
fi

0 commit comments

Comments
 (0)