chore: downmerge main to demo#225
Merged
Roopan-Microsoft merged 42 commits intodemofrom May 6, 2026
Merged
Conversation
- Reverted containerRegistryHost to use AZURE_CONTAINER_REGISTRY_HOST - Reverted AI model parameters to use AZURE_AI_MODEL_NAME, AZURE_AI_MODEL_VERSION, AZURE_AI_MODEL_CAPACITY - Reverted deployment type to use AZURE_AI_DEPLOYMENT_TYPE - Removed enableTelemetry parameter customization (uses bicep default) - Updated workflow files and documentation to reflect original naming - Kept AZURE_ENV_ prefix only for: AI_SERVICE_LOCATION, LOG_ANALYTICS_WORKSPACE_RID, FOUNDRY_PROJECT_RID, VM_ADMIN credentials, IMAGETAG
- Changed all workflow inputs from AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID to AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID - Ensures consistency with parameter files and documentation - Affected files: deploy-orchestrator.yml, deploy-v2.yml, job-deploy.yml, job-deploy-linux.yml, job-deploy-windows.yml
…_PROJECT_RID to AZURE_EXISTING_AIPROJECT_RESOURCE_ID and AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID to AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID
…rkflow validation Update validation logic and error messages in deploy-v2.yml, job-deploy-linux.yml, and job-deploy-windows.yml to use the renamed AZURE_EXISTING_AIPROJECT_RESOURCE_ID consistently. Previously, validation referenced the old AI_PROJECT_RESOURCE_ID name causing validation to silently skip. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The uv installer script requires awk for checksum verification. Without it, the build fails with 'checksum mismatch' due to missing awk command on Azure Linux base images. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…n-Solution-Accelerator into psl-prachi-params
- Rename AZURE_AI_DEPLOYMENT_TYPE to AZURE_ENV_MODEL_DEPLOYMENT_TYPE - Rename AZURE_AI_MODEL_NAME to AZURE_ENV_GPT_MODEL_NAME - Rename AZURE_AI_MODEL_VERSION to AZURE_ENV_GPT_MODEL_VERSION - Rename AZURE_AI_MODEL_CAPACITY to AZURE_ENV_GPT_MODEL_CAPACITY - Rename AZURE_ENV_IMAGETAG to AZURE_ENV_IMAGE_TAG - Rename AZURE_CONTAINER_REGISTRY_HOST to AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT Updated files: - Parameter files (main.parameters.json, main.waf.parameters.json) - Documentation (CustomizingAzdParameters.md) - Workflow files (azd-template-validation, azure-dev, job-cleanup-deployment, job-deploy-linux, job-deploy-windows) All changes validated successfully with bicep parameter validation script.
- Revert secrets.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID to secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID - Revert secrets.AZURE_EXISTING_AIPROJECT_RESOURCE_ID to secrets.AZURE_ENV_FOUNDRY_PROJECT_RID These changes ensure workflows use existing GitHub secrets without requiring updates to repository settings. The environment variable names (AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID and AZURE_EXISTING_AIPROJECT_RESOURCE_ID) remain unchanged as intended.
- Changed AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID to AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID - Changed AZURE_ENV_FOUNDRY_PROJECT_RID to AZURE_EXISTING_AIPROJECT_RESOURCE_ID - Ensures secret names match the environment variable names used throughout the codebase
- Rename containerRegistryHost to containerRegistryEndpoint - Rename aiDeploymentType to deploymentType - Rename aiModelName to gptModelName - Rename aiModelVersion to gptModelVersion - Rename aiModelCapacity to gptDeploymentCapacity Updated files: - infra/main.bicep - infra/main_custom.bicep - infra/main.parameters.json - infra/main.waf.parameters.json - infra/main.json (compiled) - .azuredevops/azure-pipeline-infrastructure.yml
- AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID → AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID - AZURE_EXISTING_AIPROJECT_RESOURCE_ID → AZURE_EXISTING_AI_PROJECT_RESOURCE_ID Secret names should not be changed per task requirements.
This reverts commit 859d75d.
…ModelVersion) while adopting latest dev features
fix: Standardization of parameters and update workflows and documentation
fix: install latest bicep via CLI
build: add cosmos in pyproject
fix: blank page issue when process failed
…ent configuration
docs: image update
fix: fixed all copilot comments
chore: Dev merge to main
Downmerge main into demo via psl-downmerge-main-to-demo. Resolved src/processor/uv.lock by regenerating with `uv lock` (both branches independently regenerated the lockfile after adding the same azure-cosmos==4.15.0 dependency). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Shreyas-Microsoft
requested review from
Avijit-Microsoft,
Dongbumlee,
Prajwal-Microsoft,
Roopan-Microsoft,
Vinay-Microsoft,
aniaroramsft,
dgp10801,
nchandhi,
sethsteenken and
toherman-msft
as code owners
Shreyas-Microsoft
temporarily deployed
to
production
GitHub Actions
Inactive
Roopan-Microsoft
approved these changes
May 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request focuses on standardizing and clarifying environment variable names and parameters related to Azure resource IDs across multiple CI/CD pipeline and workflow files. It also updates the devcontainer configuration to ensure the latest Azure CLI and Bicep tools are installed. The most important changes are grouped below by theme.
Environment Variable and Parameter Standardization:
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_IDis nowAZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID, andAZURE_EXISTING_AI_PROJECT_RESOURCE_IDis nowAZURE_EXISTING_AIPROJECT_RESOURCE_IDacross all workflow and pipeline files. This includes updating input/output names, validation logic, and usage in scripts. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]containerRegistryHosttocontainerRegistryEndpointfor improved naming accuracy, and propagated this change throughout the pipeline configuration and deployment scripts. [1] [2] [3]Devcontainer and Tooling Improvements:
Other Minor Workflow Updates:
These changes collectively improve the clarity, consistency, and maintainability of our CI/CD pipelines and development environment.
Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Other Information