Skip to content

Commit e2617fc

Browse files
Merge pull request #686 from microsoft/psl-deploymentPipelineChanges
ci: Added Deployment v2 pipeline with Windows and Linux support
2 parents ce6df3e + 1e56844 commit e2617fc

15 files changed

+1849
-2
lines changed

.github/workflows/deploy-linux.yml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Deploy-Test-Cleanup (v2) Linux
2+
on:
3+
workflow_run:
4+
workflows: ["Build Docker and Optional Push v3"]
5+
types:
6+
- completed
7+
branches:
8+
- main
9+
- dev-v3
10+
- hotfix
11+
workflow_dispatch:
12+
inputs:
13+
azure_location:
14+
description: 'Azure Location For Deployment'
15+
required: false
16+
default: 'australiaeast'
17+
type: choice
18+
options:
19+
- 'australiaeast'
20+
- 'centralus'
21+
- 'eastasia'
22+
- 'eastus2'
23+
- 'japaneast'
24+
- 'northeurope'
25+
- 'southeastasia'
26+
- 'uksouth'
27+
resource_group_name:
28+
description: 'Resource Group Name (Optional)'
29+
required: false
30+
default: ''
31+
type: string
32+
33+
waf_enabled:
34+
description: 'Enable WAF'
35+
required: false
36+
default: false
37+
type: boolean
38+
EXP:
39+
description: 'Enable EXP'
40+
required: false
41+
default: false
42+
type: boolean
43+
build_docker_image:
44+
description: 'Build & Push Docker Image (Optional)'
45+
required: false
46+
default: false
47+
type: boolean
48+
49+
cleanup_resources:
50+
description: 'Cleanup Deployed Resources'
51+
required: false
52+
default: false
53+
type: boolean
54+
55+
run_e2e_tests:
56+
description: 'Run End-to-End Tests'
57+
required: false
58+
default: 'GoldenPath-Testing'
59+
type: choice
60+
options:
61+
- 'GoldenPath-Testing'
62+
- 'Smoke-Testing'
63+
- 'None'
64+
65+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
66+
description: 'Log Analytics Workspace ID (Optional)'
67+
required: false
68+
default: ''
69+
type: string
70+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
71+
description: 'AI Project Resource ID (Optional)'
72+
required: false
73+
default: ''
74+
type: string
75+
existing_webapp_url:
76+
description: 'Existing WebApp URL (Skips Deployment)'
77+
required: false
78+
default: ''
79+
type: string
80+
81+
schedule:
82+
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
83+
84+
jobs:
85+
Run:
86+
uses: ./.github/workflows/deploy-orchestrator.yml
87+
with:
88+
runner_os: ubuntu-latest
89+
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
90+
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
91+
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
92+
EXP: ${{ github.event.inputs.EXP == 'true' }}
93+
build_docker_image: ${{ github.event.inputs.build_docker_image == 'true' }}
94+
cleanup_resources: ${{ github.event.inputs.cleanup_resources == 'true' }}
95+
run_e2e_tests: ${{ github.event.inputs.run_e2e_tests || 'GoldenPath-Testing' }}
96+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || '' }}
97+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID || '' }}
98+
existing_webapp_url: ${{ github.event.inputs.existing_webapp_url || '' }}
99+
trigger_type: ${{ github.event_name }}
100+
secrets: inherit
Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
name: Deployment orchestrator v2
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
runner_os:
7+
description: 'Runner OS (ubuntu-latest or windows-latest)'
8+
required: true
9+
type: string
10+
azure_location:
11+
description: 'Azure Location For Deployment'
12+
required: false
13+
default: 'australiaeast'
14+
type: string
15+
resource_group_name:
16+
description: 'Resource Group Name (Optional)'
17+
required: false
18+
default: ''
19+
type: string
20+
waf_enabled:
21+
description: 'Enable WAF'
22+
required: false
23+
default: false
24+
type: boolean
25+
EXP:
26+
description: 'Enable EXP'
27+
required: false
28+
default: false
29+
type: boolean
30+
build_docker_image:
31+
description: 'Build And Push Docker Image (Optional)'
32+
required: false
33+
default: false
34+
type: boolean
35+
cleanup_resources:
36+
description: 'Cleanup Deployed Resources'
37+
required: false
38+
default: false
39+
type: boolean
40+
run_e2e_tests:
41+
description: 'Run End-to-End Tests'
42+
required: false
43+
default: 'GoldenPath-Testing'
44+
type: string
45+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
46+
description: 'Log Analytics Workspace ID (Optional)'
47+
required: false
48+
default: ''
49+
type: string
50+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
51+
description: 'AI Project Resource ID (Optional)'
52+
required: false
53+
default: ''
54+
type: string
55+
existing_webapp_url:
56+
description: 'Existing Container WebApp URL (Skips Deployment)'
57+
required: false
58+
default: ''
59+
type: string
60+
trigger_type:
61+
description: 'Trigger type (workflow_dispatch, pull_request, schedule)'
62+
required: true
63+
type: string
64+
65+
env:
66+
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
67+
68+
jobs:
69+
docker-build:
70+
uses: ./.github/workflows/job-docker-build.yml
71+
with:
72+
trigger_type: ${{ inputs.trigger_type }}
73+
build_docker_image: ${{ inputs.build_docker_image }}
74+
secrets: inherit
75+
76+
deploy:
77+
if: always() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)
78+
needs: docker-build
79+
uses: ./.github/workflows/job-deploy.yml
80+
with:
81+
trigger_type: ${{ inputs.trigger_type }}
82+
runner_os: ${{ inputs.runner_os }}
83+
azure_location: ${{ inputs.azure_location }}
84+
resource_group_name: ${{ inputs.resource_group_name }}
85+
waf_enabled: ${{ inputs.waf_enabled }}
86+
EXP: ${{ inputs.EXP }}
87+
build_docker_image: ${{ inputs.build_docker_image }}
88+
existing_webapp_url: ${{ inputs.existing_webapp_url }}
89+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
90+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
91+
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
92+
run_e2e_tests: ${{ inputs.run_e2e_tests }}
93+
cleanup_resources: ${{ inputs.cleanup_resources }}
94+
secrets: inherit
95+
96+
e2e-test:
97+
if: always() && ((needs.deploy.result == 'success' && needs.deploy.outputs.WEBAPP_URL != '') || (inputs.existing_webapp_url != '' && inputs.existing_webapp_url != null)) && (inputs.trigger_type != 'workflow_dispatch' || (inputs.run_e2e_tests != 'None' && inputs.run_e2e_tests != '' && inputs.run_e2e_tests != null))
98+
needs: [docker-build, deploy]
99+
uses: ./.github/workflows/test-automation-v2.yml
100+
with:
101+
MACAE_WEB_URL: ${{ needs.deploy.outputs.WEBAPP_URL || inputs.existing_webapp_url }}
102+
MACAE_URL_API: ${{ needs.deploy.outputs.MACAE_URL_API }}
103+
MACAE_RG: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
104+
TEST_SUITE: ${{ inputs.trigger_type == 'workflow_dispatch' && inputs.run_e2e_tests || 'GoldenPath-Testing' }}
105+
secrets: inherit
106+
107+
send-notification:
108+
if: always()
109+
needs: [docker-build, deploy, e2e-test]
110+
uses: ./.github/workflows/job-send-notification.yml
111+
with:
112+
trigger_type: ${{ inputs.trigger_type }}
113+
waf_enabled: ${{ inputs.waf_enabled }}
114+
EXP: ${{ inputs.EXP }}
115+
run_e2e_tests: ${{ inputs.run_e2e_tests }}
116+
existing_webapp_url: ${{ inputs.existing_webapp_url }}
117+
deploy_result: ${{ needs.deploy.result }}
118+
e2e_test_result: ${{ needs.e2e-test.result }}
119+
CONTAINER_WEB_APPURL: ${{ needs.deploy.outputs.WEBAPP_URL }}
120+
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
121+
QUOTA_FAILED: ${{ needs.deploy.outputs.QUOTA_FAILED }}
122+
TEST_SUCCESS: ${{ needs.e2e-test.outputs.TEST_SUCCESS }}
123+
TEST_REPORT_URL: ${{ needs.e2e-test.outputs.TEST_REPORT_URL }}
124+
secrets: inherit
125+
126+
cleanup-deployment:
127+
if: always() && needs.deploy.result == 'success' && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)
128+
needs: [docker-build, deploy, e2e-test]
129+
uses: ./.github/workflows/job-cleanup-deployment.yml
130+
with:
131+
runner_os: ${{ inputs.runner_os }}
132+
trigger_type: ${{ inputs.trigger_type }}
133+
cleanup_resources: ${{ inputs.cleanup_resources }}
134+
existing_webapp_url: ${{ inputs.existing_webapp_url }}
135+
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
136+
AZURE_LOCATION: ${{ needs.deploy.outputs.AZURE_LOCATION }}
137+
AZURE_ENV_OPENAI_LOCATION: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
138+
ENV_NAME: ${{ needs.deploy.outputs.ENV_NAME }}
139+
IMAGE_TAG: ${{ needs.deploy.outputs.IMAGE_TAG }}
140+
secrets: inherit
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Deploy-Test-Cleanup (v2) Windows
2+
on:
3+
# workflow_run:
4+
# workflows: ["Build Docker and Optional Push v3"]
5+
# types:
6+
# - completed
7+
# branches:
8+
# - main
9+
# - dev-v3
10+
# - hotfix
11+
workflow_dispatch:
12+
inputs:
13+
azure_location:
14+
description: 'Azure Location For Deployment'
15+
required: false
16+
default: 'australiaeast'
17+
type: choice
18+
options:
19+
- 'australiaeast'
20+
- 'centralus'
21+
- 'eastasia'
22+
- 'eastus2'
23+
- 'japaneast'
24+
- 'northeurope'
25+
- 'southeastasia'
26+
- 'uksouth'
27+
resource_group_name:
28+
description: 'Resource Group Name (Optional)'
29+
required: false
30+
default: ''
31+
type: string
32+
33+
waf_enabled:
34+
description: 'Enable WAF'
35+
required: false
36+
default: false
37+
type: boolean
38+
EXP:
39+
description: 'Enable EXP'
40+
required: false
41+
default: false
42+
type: boolean
43+
build_docker_image:
44+
description: 'Build & Push Docker Image (Optional)'
45+
required: false
46+
default: false
47+
type: boolean
48+
49+
cleanup_resources:
50+
description: 'Cleanup Deployed Resources'
51+
required: false
52+
default: false
53+
type: boolean
54+
55+
run_e2e_tests:
56+
description: 'Run End-to-End Tests'
57+
required: false
58+
default: 'GoldenPath-Testing'
59+
type: choice
60+
options:
61+
- 'GoldenPath-Testing'
62+
- 'Smoke-Testing'
63+
- 'None'
64+
65+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
66+
description: 'Log Analytics Workspace ID (Optional)'
67+
required: false
68+
default: ''
69+
type: string
70+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
71+
description: 'AI Project Resource ID (Optional)'
72+
required: false
73+
default: ''
74+
type: string
75+
existing_webapp_url:
76+
description: 'Existing WebApp URL (Skips Deployment)'
77+
required: false
78+
default: ''
79+
type: string
80+
81+
# schedule:
82+
# - cron: '0 11,23 * * *' # Runs at 11:00 AM and 11:00 PM GMT
83+
84+
jobs:
85+
Run:
86+
uses: ./.github/workflows/deploy-orchestrator.yml
87+
with:
88+
runner_os: windows-latest
89+
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
90+
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
91+
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
92+
EXP: ${{ github.event.inputs.EXP == 'true' }}
93+
build_docker_image: ${{ github.event.inputs.build_docker_image == 'true' }}
94+
cleanup_resources: ${{ github.event.inputs.cleanup_resources == 'true' }}
95+
run_e2e_tests: ${{ github.event.inputs.run_e2e_tests || 'GoldenPath-Testing' }}
96+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || '' }}
97+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID || '' }}
98+
existing_webapp_url: ${{ github.event.inputs.existing_webapp_url || '' }}
99+
trigger_type: ${{ github.event_name }}
100+
secrets: inherit

0 commit comments

Comments
 (0)