Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- completed
branches:
- main
- dev-v4
- dev
- hotfix
workflow_dispatch:
inputs:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- completed
branches:
- main
- dev-v4
- dev
- hotfix
schedule:
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
Expand Down Expand Up @@ -129,13 +129,13 @@ jobs:
id: deploy
run: |
if [[ "${{ env.BRANCH_NAME }}" == "main" ]]; then
IMAGE_TAG="latest_v4"
elif [[ "${{ env.BRANCH_NAME }}" == "dev-v4" ]]; then
IMAGE_TAG="dev_v4"
IMAGE_TAG="latest_v5"
elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then
IMAGE_TAG="dev_v5"
elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
IMAGE_TAG="hotfix"
else
IMAGE_TAG="latest_v4"
IMAGE_TAG="latest_v5"
fi

# Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- dev-v4
- dev
- demo-v4
- hotfix
paths:
Expand Down Expand Up @@ -86,11 +86,11 @@ jobs:
id: determine_tag
run: |
if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
echo "TAG=latest_v4" >> $GITHUB_ENV
elif [[ "${{ github.ref }}" == "refs/heads/dev-v4" ]]; then
echo "TAG=dev_v4" >> $GITHUB_ENV
echo "TAG=latest_v5" >> $GITHUB_ENV
elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
echo "TAG=dev_v5" >> $GITHUB_ENV
elif [[ "${{ github.ref }}" == "refs/heads/demo-v4" ]]; then
echo "TAG=demo_v4" >> $GITHUB_ENV
echo "TAG=demo_v5" >> $GITHUB_ENV
elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then
echo "TAG=hotfix" >> $GITHUB_ENV
else
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/job-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -431,13 +431,13 @@ jobs:
echo "Current branch: $BRANCH_NAME"

if [[ "$BRANCH_NAME" == "main" ]]; then
IMAGE_TAG="latest_v4"
elif [[ "$BRANCH_NAME" == "dev-v4" ]]; then
IMAGE_TAG="dev_v4"
IMAGE_TAG="latest_v5"
elif [[ "$BRANCH_NAME" == "dev" ]]; then
IMAGE_TAG="dev_v5"
elif [[ "$BRANCH_NAME" == "hotfix" ]]; then
IMAGE_TAG="hotfix"
else
IMAGE_TAG="latest_v4"
IMAGE_TAG="latest_v5"
fi
echo "Using existing Docker image tag: $IMAGE_TAG"
fi
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
- demo-v4
- dev-v4
- dev
paths:
- 'src/backend/**/*.py'
- 'src/tests/**/*.py'
Expand All @@ -24,7 +24,7 @@ on:
branches:
- main
- demo-v4
- dev-v4
- dev
paths:
- 'src/backend/**/*.py'
- 'src/tests/**/*.py'
Expand Down
2 changes: 1 addition & 1 deletion docs/CustomizingAzdParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ By default this template will use the environment name as the prefix to prevent
| `AZURE_ENV_REASONING_MODEL_NAME` | string | `o4-mini` | Specifies the name of the reasoning GPT model to be deployed. |
| `AZURE_ENV_REASONING_MODEL_VERSION` | string | `2025-04-16` | Version of the reasoning GPT model to be used for deployment. |
| `AZURE_ENV_REASONING_MODEL_CAPACITY` | int | `50` | Sets the reasoning GPT model capacity. |
| `AZURE_ENV_IMAGE_TAG` | string | `latest_v4` | Docker image tag used for container deployments. |
| `AZURE_ENV_IMAGE_TAG` | string | `latest_v5` | Docker image tag used for container deployments. |
| `AZURE_ENV_ENABLE_TELEMETRY` | bool | `true` | Enables telemetry for monitoring and diagnostics. |
| `AZURE_EXISTING_AIPROJECT_RESOURCE_ID` | string | `<Existing Workspace Id>` | Set this if you want to reuse an AI Foundry Project instead of creating a new one. |
| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID` | string | Guide to get your [Existing Workspace ID](re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one. |
Expand Down
6 changes: 3 additions & 3 deletions infra/avm/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ param backendContainerRegistryHostname string = 'biabcontainerreg.azurecr.io'
param backendContainerImageName string = 'macaebackend'

@description('Optional. The Container Image Tag to deploy on the backend.')
param backendContainerImageTag string = 'latest_v4'
param backendContainerImageTag string = 'latest_v5'

@description('Optional. The Container Registry hostname where the docker images for the frontend are located.')
param frontendContainerRegistryHostname string = 'biabcontainerreg.azurecr.io'
Expand All @@ -162,7 +162,7 @@ param frontendContainerRegistryHostname string = 'biabcontainerreg.azurecr.io'
param frontendContainerImageName string = 'macaefrontend'

@description('Optional. The Container Image Tag to deploy on the frontend.')
param frontendContainerImageTag string = 'latest_v4'
param frontendContainerImageTag string = 'latest_v5'

@description('Optional. The Container Registry hostname where the docker images for the MCP are located.')
param MCPContainerRegistryHostname string = 'biabcontainerreg.azurecr.io'
Expand All @@ -171,7 +171,7 @@ param MCPContainerRegistryHostname string = 'biabcontainerreg.azurecr.io'
param MCPContainerImageName string = 'macaemcp'

@description('Optional. The Container Image Tag to deploy on the MCP.')
param MCPContainerImageTag string = 'latest_v4'
param MCPContainerImageTag string = 'latest_v5'

// ============================================================================
// Parameters — Feature Flags / WAF
Expand Down
Loading