Skip to content

Commit 3879ce9

Browse files
Harmanpreet-MicrosoftHarmanpreet-Microsoft
committed
fix: update environment variable names for image tag and AI project resource ID in workflows and scripts
1 parent d44675e commit 3879ce9

6 files changed

Lines changed: 22 additions & 17 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ jobs:
240240
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$INPUT_AZURE_ENV_OPENAI_LOCATION"
241241
azd env set AZURE_LOCATION="$INPUT_AZURE_LOCATION"
242242
azd env set AZURE_RESOURCE_GROUP="$INPUT_RESOURCE_GROUP_NAME"
243-
azd env set AZURE_ENV_IMAGETAG="$INPUT_IMAGE_TAG"
243+
azd env set AZURE_ENV_IMAGE_TAG="$INPUT_IMAGE_TAG"
244244
245245
if [[ "$INPUT_BUILD_DOCKER_IMAGE" == "true" ]]; then
246246
ACR_NAME="${{ secrets.ACR_TEST_LOGIN_SERVER }}"
@@ -256,13 +256,13 @@ jobs:
256256
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
257257
EXP_LOG_ANALYTICS_ID="$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID"
258258
else
259-
EXP_LOG_ANALYTICS_ID="${{ vars.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
259+
EXP_LOG_ANALYTICS_ID="${{ vars.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}"
260260
fi
261261
262262
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
263263
EXP_AI_PROJECT_ID="$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID"
264264
else
265-
EXP_AI_PROJECT_ID="${{ vars.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
265+
EXP_AI_PROJECT_ID="${{ vars.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}"
266266
fi
267267
268268
echo "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:INPUT_AZURE_ENV_OPENAI_LOCATION"
245245
azd env set AZURE_LOCATION="$env:INPUT_AZURE_LOCATION"
246246
azd env set AZURE_RESOURCE_GROUP="$env:INPUT_RESOURCE_GROUP_NAME"
247-
azd env set AZURE_ENV_IMAGETAG="$env:INPUT_IMAGE_TAG"
247+
azd env set AZURE_ENV_IMAGE_TAG="$env:INPUT_IMAGE_TAG"
248248
249249
# Set ACR name only when building Docker image
250250
if ("$env:INPUT_BUILD_DOCKER_IMAGE" -eq "true") {
@@ -262,13 +262,13 @@ jobs:
262262
if ("$env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" -ne "") {
263263
$EXP_LOG_ANALYTICS_ID = "$env:INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID"
264264
} else {
265-
$EXP_LOG_ANALYTICS_ID = "${{ vars.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}"
265+
$EXP_LOG_ANALYTICS_ID = "${{ vars.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}"
266266
}
267267
268268
if ("$env:INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" -ne "") {
269269
$EXP_AI_PROJECT_ID = "$env:INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID"
270270
} else {
271-
$EXP_AI_PROJECT_ID = "${{ vars.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}"
271+
$EXP_AI_PROJECT_ID = "${{ vars.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}"
272272
}
273273
274274
Write-Host "AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID"

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,12 @@ jobs:
362362
rg_exists=$(az group exists --name $RESOURCE_GROUP_NAME)
363363
if [ "$rg_exists" = "false" ]; then
364364
echo "📦 Resource group does not exist. Creating new resource group '$RESOURCE_GROUP_NAME' in location '$AZURE_LOCATION'..."
365-
az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION --tags ${{ env.RG_TAGS }} || { echo "❌ Error creating resource group"; exit 1; }
365+
RG_TAGS="${{ env.RG_TAGS }}"
366+
if [ -n "$RG_TAGS" ]; then
367+
az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION --tags "$RG_TAGS" || { echo "❌ Error creating resource group"; exit 1; }
368+
else
369+
az group create --name $RESOURCE_GROUP_NAME --location $AZURE_LOCATION || { echo "❌ Error creating resource group"; exit 1; }
370+
fi
366371
echo "✅ Resource group '$RESOURCE_GROUP_NAME' created successfully."
367372
else
368373
echo "✅ Resource group '$RESOURCE_GROUP_NAME' already exists. Deploying to existing resource group."

‎docs/CustomizingAzdParameters.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ By default this template will use the environment name as the prefix to prevent
1616
| `AZURE_ENV_GPT_MODEL_VERSION` | string | `2024-08-06` | Set the Azure model version (allowed values: 2024-08-06) |
1717
| `AZURE_ENV_GPT_MODEL_CAPACITY` | integer | `150` | Set the Model Capacity (choose a number based on available GPT model capacity in your subscription). |
1818
| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID`| string | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one. |
19-
| `AZURE_ENV_IMAGETAG` | string | `latest` | Set the Image tag Like (allowed values: latest, dev, hotfix) |
20-
| `AZURE_ENV_VM_SIZE` | string | `Standard_D2s_v5` | Specifies the size of the Jumpbox Virtual Machine (e.g., `Standard_D2s_v5`, `Standard_D2s_v4`). Set a custom value if `enablePrivateNetworking` is `true`. |
19+
| `AZURE_ENV_IMAGE_TAG` | string | `latest` | Set the Image tag Like (allowed values: latest, dev, hotfix) |
20+
| `AZURE_ENV_VM_SIZE` | string | `Standard_D2s_v5` | Specifies the size of the Jumpbox Virtual Machine (e.g., `Standard_D2s_v5`, `Standard_D2s_v4`). Set a custom value if `enablePrivateNetworking` is `true`. |
2121
| `AZURE_ENV_JUMPBOX_ADMIN_USERNAME` | string | `JumpboxAdminUser` | Specifies the administrator username for the Jumpbox Virtual Machine. |
2222
| `AZURE_ENV_JUMPBOX_ADMIN_PASSWORD` | string | `JumpboxAdminP@ssw0rd1234!` | Specifies the administrator password for the Jumpbox Virtual Machine. |
2323
| `AZURE_ENV_COSMOS_SECONDARY_LOCATION` | string | *(not set by default)* | Specifies the secondary region for Cosmos DB. Required if `enableRedundancy` is `true`. |
24-
| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID` | string | *(not set by default)* | Specifies the existing AI Foundry Project Resource ID if it needs to be reused. |
25-
| `AZURE_ENV_ACR_NAME` | string | `cmsacontainerreg.azurecr.io` | Specifies the Azure Container Registry name to use for container images. |
24+
| `AZURE_EXISTING_AIPROJECT_RESOURCE_ID` | string | *(not set by default)* | Specifies the existing AI Foundry Project Resource ID if it needs to be reused. |
25+
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT`| string | *(not set by default)* | Specifies the Azure Container Registry endpoint to use for container images. |
2626

2727
---
2828

‎scripts/validate_model_deployment_quota.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ Write-Host "🎯 Active Subscription: $(az account show --query '[name, id]' --o
7777
$QuotaAvailable = $true
7878

7979
foreach ($deployment in $aiModelDeployments) {
80-
$name = if ($env:AZURE_ENV_MODEL_NAME) { $env:AZURE_ENV_MODEL_NAME } else { $deployment.name }
81-
$model = if ($env:AZURE_ENV_MODEL_NAME) { $env:AZURE_ENV_MODEL_NAME } else { $deployment.model.name }
80+
$name = if ($env:AZURE_ENV_GPT_MODEL_NAME) { $env:AZURE_ENV_GPT_MODEL_NAME } else { $deployment.name }
81+
$model = if ($env:AZURE_ENV_GPT_MODEL_NAME) { $env:AZURE_ENV_GPT_MODEL_NAME } else { $deployment.model.name }
8282
$type = if ($env:AZURE_ENV_MODEL_DEPLOYMENT_TYPE) { $env:AZURE_ENV_MODEL_DEPLOYMENT_TYPE } else { $deployment.sku.name }
83-
$capacity = if ($env:AZURE_ENV_MODEL_CAPACITY) { $env:AZURE_ENV_MODEL_CAPACITY } else { $deployment.sku.capacity }
83+
$capacity = if ($env:AZURE_ENV_GPT_MODEL_CAPACITY) { $env:AZURE_ENV_GPT_MODEL_CAPACITY } else { $deployment.sku.capacity }
8484

8585
Write-Host "`n🔍 Validating model deployment: $name ..."
8686
& .\scripts\validate_model_quota.ps1 -Location $Location -Model $model -Capacity $capacity -DeploymentType $type

‎scripts/validate_model_deployment_quota.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ echo "🎯 Active Subscription: $(az account show --query '[name, id]' --output
8888
quotaAvailable=true
8989

9090
while IFS= read -r deployment; do
91-
name=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.name')}
92-
model=${AZURE_ENV_MODEL_NAME:-$(echo "$deployment" | jq -r '.model.name')}
91+
name=${AZURE_ENV_GPT_MODEL_NAME:-$(echo "$deployment" | jq -r '.name')}
92+
model=${AZURE_ENV_GPT_MODEL_NAME:-$(echo "$deployment" | jq -r '.model.name')}
9393
type=${AZURE_ENV_MODEL_DEPLOYMENT_TYPE:-$(echo "$deployment" | jq -r '.sku.name')}
94-
capacity=${AZURE_ENV_MODEL_CAPACITY:-$(echo "$deployment" | jq -r '.sku.capacity')}
94+
capacity=${AZURE_ENV_GPT_MODEL_CAPACITY:-$(echo "$deployment" | jq -r '.sku.capacity')}
9595

9696
echo "🔍 Validating model deployment: $name ..."
9797
./scripts/validate_model_quota.sh --location "$LOCATION" --model "$model" --capacity "$capacity" --deployment-type "$type"

0 commit comments

Comments
 (0)