Skip to content

chore: dev to main merge#1050

Open
Akhileswara-Microsoft wants to merge 17 commits into
macae-v4from
dev-v4
Open

chore: dev to main merge#1050
Akhileswara-Microsoft wants to merge 17 commits into
macae-v4from
dev-v4

Conversation

@Akhileswara-Microsoft

Copy link
Copy Markdown
Contributor

Purpose

This pull request makes several important updates to the deployment configuration, focusing on lowering the default GPT-4.1 model capacity from 150k to 50k tokens, updating documentation and templates to reflect this change, and improving security and maintainability in deployment workflows by switching from secrets to environment variables for Azure Container Registry (ACR) access and clarifying role assignments.

Model Capacity Reduction and Documentation Updates:

  • Lowered the default GPT-4.1 model capacity from 150k to 50k tokens across Bicep templates (infra/main.bicep, infra/main.json), workflow files, and all related documentation. This includes updating default values, usage instructions, and quota check scripts to ensure consistency and clarity for users.
    Deployment Workflow Security and Maintenance:

  • Switched from using GitHub secrets to environment variables (vars) for referencing the ACR login server in all relevant workflow files, improving maintainability and aligning with best practices for workflow configuration.

  • Updated the Docker build workflow to clarify its purpose, add manual trigger support (workflow_dispatch), and set appropriate permissions for GitHub Actions OIDC authentication.

Role Assignment Improvements:

  • Replaced string-based role names with explicit Azure role definition IDs in Bicep templates for Storage and Search resources, making role assignments more robust and less error-prone.

Workflow Logic and Template Updates:

  • Adjusted workflow logic to control when the Docker build job runs, ensuring it only triggers on manual dispatch with the appropriate input.
  • Updated Bicep-generated JSON templates to reflect the new Bicep version and template hashes, ensuring infrastructure as code is up to date.

These changes together improve the clarity, security, and maintainability of the deployment process while aligning documentation and infrastructure defaults with the new model capacity standard.

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

Other Information

This pull request makes several important updates to the deployment configuration, focusing on lowering the default GPT-4.1 model capacity from 150k to 50k tokens, improving Azure Container Registry (ACR) variable handling, and updating role assignments to use explicit GUIDs. These changes affect both the infrastructure code and documentation to ensure consistency and clarity for users and maintainers.

Model Capacity & Documentation Updates:

  • Lowered the default GPT-4.1 model capacity from 150k to 50k tokens in deployment templates, parameters, and documentation to reduce resource requirements and align with current recommendations.

Azure Container Registry (ACR) Variable Handling:

  • Switched from using secrets.ACR_TEST_LOGIN_SERVER to vars.ACR_TEST_LOGIN_SERVER throughout workflow files for improved security and flexibility. This affects Docker build, deploy, and image tagging steps.

Workflow and Job Configuration:

  • Removed unused workflow inputs and conditional logic from job-docker-build.yml and deploy-orchestrator.yml, simplifying the triggering and execution of Docker build jobs.

Role Assignment Specification:

  • Updated role assignments in Bicep templates to use explicit role definition GUIDs instead of role names, improving reliability of deployments.

Infrastructure Template Updates:

  • Regenerated infra/main.json with Bicep v0.44.1, reflecting the above changes and updating template hashes and dependency order for improved reproducibility.

These updates collectively streamline deployment, improve security and maintainability, and ensure the documentation matches the current configuration.

@github-actions

github-actions Bot commented Jun 19, 2026

Copy link
Copy Markdown

Coverage

Coverage Report •
FileStmtsMissCoverMissing
TOTAL305538187% 
report-only-changed-files is enabled. No files were changed during this commit :)

Tests Skipped Failures Errors Time
886 5 💤 0 ❌ 0 🔥 8.084s ⏱️

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the solution accelerator’s deployment defaults and supporting automation/docs, primarily to reduce the default GPT-4.1 deployment capacity and harden/standardize deployment-related configuration (workflows + RBAC role assignments).

Changes:

  • Reduced default GPT-4.1 capacity from 150k to 50k across infra templates, workflows, and quota-check tooling/docs.
  • Updated Bicep role assignments to use explicit role definition GUIDs (instead of role names) for improved robustness.
  • Adjusted GitHub Actions workflows to use vars.ACR_TEST_LOGIN_SERVER for ACR endpoints and refined Docker build workflow triggering/structure.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 8 comments.

Show a summary per file
File Description
src/tests/backend/v4/config/test_settings.py Minor async test adjustments around cancelled task awaits.
src/tests/backend/common/database/test_database_base.py Refactors the exception-handling context-manager test structure.
infra/scripts/quota_check_params.sh Lowers default model capacity in the quota-check script.
infra/main.json Regenerated ARM JSON template reflecting new defaults and Bicep generator version.
infra/main.bicep Lowers GPT-4.1 capacity default and switches role assignments to GUIDs.
infra/main_custom.bicep Mirrors main.bicep capacity + role GUID updates for the custom template.
docs/quota_check.md Updates quota guidance and examples to reflect 50k capacity defaults.
docs/DeploymentGuide.md Updates documented default quota configuration and recommendations.
docs/CustomizingAzdParameters.md Updates documented default parameter value for GPT-4.1 capacity.
.github/workflows/job-docker-build.yml Converts ACR endpoint to vars, adds manual trigger, and adjusts permissions/structure.
.github/workflows/job-deploy.yml Updates quota minimum environment default for GPT capacity.
.github/workflows/job-deploy-windows.yml Switches ACR endpoint reference from secrets to vars.
.github/workflows/job-deploy-linux.yml Switches ACR endpoint reference from secrets to vars.
.github/workflows/deploy.yml Updates quota minimum environment default for GPT capacity.
.github/workflows/deploy-orchestrator.yml Moves docker-build conditional logic to the caller and simplifies invocation.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/tests/backend/v4/config/test_settings.py
Comment thread src/tests/backend/v4/config/test_settings.py
Comment thread docs/quota_check.md Outdated
Comment thread .github/workflows/job-docker-build.yml
Comment thread .github/workflows/job-docker-build.yml
Comment thread .github/workflows/job-docker-build.yml
Comment thread .github/workflows/job-docker-build.yml
Comment thread .github/workflows/job-deploy.yml
chaudhariniraj and others added 2 commits June 19, 2026 12:06
fix: Fix model version in document (Copilot comment fix)
@Roopan-Microsoft Roopan-Microsoft changed the base branch from main to macae-v4 June 19, 2026 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants