Skip to content

Commit 2a1ddfc

Browse files
rmarinhormarinho
authored
Update with new pipelines (#32264)
1 parent 0a86d2f commit 2a1ddfc

File tree

2 files changed

+102
-71
lines changed

2 files changed

+102
-71
lines changed

‎eng/pipelines/azure-pipelines-internal.yml‎ renamed to ‎eng/pipelines/ci-official.yml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ extends:
8282
pool: ${{ parameters.VM_IMAGE_HOST }}
8383
enableSourceIndex: false
8484
runAsPublic: false
85+
enableMicrobuild: true
86+
publishAssets: true
8587
sourceIndexParams:
8688
sourceIndexBuildCommand: build.cmd -restore -build -ci /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
8789
binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
@@ -120,22 +122,4 @@ extends:
120122
- Validate
121123
# This is to enable SDL runs part of Post-Build Validation Stage
122124
SDLValidationParameters:
123-
enable: false
124-
125-
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
126-
- template: /eng/pipelines/arcade/stage-unit-tests.yml@self
127-
parameters:
128-
jobMatrix:
129-
- name: win_unit_tests
130-
displayName: Windows Unit Tests
131-
pool: ${{ parameters.VM_IMAGE_HOST }}
132-
timeout: 120
133-
testOS: Windows
134-
- name: mac_unit_tests
135-
displayName: macOS Unit Tests
136-
pool:
137-
name: Azure Pipelines
138-
vmImage: $(HostedMacImage)
139-
os: macOS
140-
timeout: 120
141-
testOS: macOS
125+
enable: false

‎eng/pipelines/azure-pipelines-public.yml‎ renamed to ‎eng/pipelines/ci.yml‎

Lines changed: 99 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ trigger:
55
- main
66
- net10.0
77
- release/*
8-
- internal/release/*
98
- inflight/*
109
paths:
1110
include:
@@ -25,7 +24,6 @@ pr:
2524
- main
2625
- net10.0
2726
- release/*
28-
- internal/release/*
2927
- inflight/*
3028
paths:
3129
include:
@@ -45,12 +43,6 @@ variables:
4543
- template: /eng/pipelines/arcade/variables.yml@self
4644

4745
parameters:
48-
- name: PackPlatform
49-
type: object
50-
default:
51-
name: NetCore-Public
52-
image: 1es-windows-2022
53-
os: windows
5446

5547
- name: BuildConfigurations
5648
type: object
@@ -59,6 +51,20 @@ parameters:
5951
- Release
6052

6153
- name: BuildPlatforms
54+
type: object
55+
default:
56+
- name: NetCore1ESPool-Internal
57+
image: 1es-windows-2022
58+
os: Windows
59+
buildScript: $(_buildScript)
60+
sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
61+
- name: Azure Pipelines
62+
vmImage: $(HostedMacImage)
63+
os: macOS
64+
buildScript: $(_buildScriptMacOS)
65+
sln: '$(Build.SourcesDirectory)/Microsoft.Maui-mac.slnf'
66+
67+
- name: BuildPlatformsPublic
6268
type: object
6369
default:
6470
- name: NetCore-Public
@@ -72,11 +78,38 @@ parameters:
7278
buildScript: $(_buildScriptMacOS)
7379
sln: '$(Build.SourcesDirectory)/Microsoft.Maui-mac.slnf'
7480

81+
- name: WindowsPool
82+
type: object
83+
default:
84+
internal:
85+
name: NetCore1ESPool-Internal
86+
image: 1es-windows-2022
87+
os: windows
88+
public:
89+
name: NetCore-Public
90+
image: 1es-windows-2022
91+
os: windows
92+
93+
- name: MacOSPool
94+
type: object
95+
default:
96+
name: Azure Pipelines
97+
vmImage: $(HostedMacImage)
98+
os: macOS
99+
75100
stages:
76101

77102
- template: /eng/pipelines/arcade/stage-helix-tests.yml@self
78103
parameters:
79-
runAsPublic: true
104+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
105+
helixPool: ${{ parameters.WindowsPool.public }}
106+
runAsPublic: true
107+
helixInternal: 'False'
108+
${{ else }}:
109+
helixPool: ${{ parameters.WindowsPool.internal }}
110+
runAsPublic: false
111+
helixInternal: 'True'
112+
HelixAccessToken: $(HelixApiAccessToken)
80113
prepareSteps:
81114
- template: /eng/pipelines/common/provision.yml@self
82115
parameters:
@@ -92,8 +125,12 @@ stages:
92125

93126
- template: /eng/pipelines/arcade/stage-pack.yml@self
94127
parameters:
95-
pool: ${{ parameters.PackPlatform }}
96-
runAsPublic: true
128+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
129+
pool: ${{ parameters.WindowsPool.public }}
130+
runAsPublic: true
131+
${{ else }}:
132+
pool: ${{ parameters.WindowsPool.internal }}
133+
runAsPublic: false
97134
prepareSteps:
98135
- template: /eng/pipelines/common/provision.yml@self
99136
parameters:
@@ -110,8 +147,12 @@ stages:
110147
- template: /eng/pipelines/arcade/stage-build.yml@self
111148
parameters:
112149
buildConfigurations: ${{ parameters.BuildConfigurations }}
113-
buildPlatforms: ${{ parameters.BuildPlatforms }}
114-
runAsPublic: ${{ eq(variables['_RunAsPublic'], 'true') }}
150+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
151+
buildPlatforms: ${{ parameters.BuildPlatformsPublic }}
152+
runAsPublic: true
153+
${{ else }}:
154+
buildPlatforms: ${{ parameters.BuildPlatforms }}
155+
runAsPublic: false
115156
prepareSteps:
116157
- template: /eng/pipelines/common/provision.yml@self
117158
parameters:
@@ -130,15 +171,17 @@ stages:
130171
jobMatrix:
131172
- name: win_unit_tests
132173
displayName: Windows Unit Tests
133-
pool: ${{ parameters.PackPlatform }}
174+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
175+
pool: ${{ parameters.WindowsPool.public }}
176+
runAsPublic: true
177+
${{ else }}:
178+
pool: ${{ parameters.WindowsPool.internal }}
179+
runAsPublic: false
134180
timeout: 90
135181
testOS: Windows
136182
- name: mac_unit_tests
137183
displayName: macOS Unit Tests
138-
pool:
139-
name: Azure Pipelines
140-
vmImage: $(HostedMacImage)
141-
os: macOS
184+
pool: ${{ parameters.MacOSPool }}
142185
timeout: 90
143186
testOS: macOS
144187
publishTaskPrefix: ''
@@ -149,80 +192,84 @@ stages:
149192
publishTaskPrefix: ''
150193
jobMatrix:
151194
- name: win_sample_tests
152-
pool: ${{ parameters.PackPlatform }}
195+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
196+
pool: ${{ parameters.WindowsPool.public }}
197+
runAsPublic: true
198+
${{ else }}:
199+
pool: ${{ parameters.WindowsPool.internal }}
200+
runAsPublic: false
153201
timeout: 120
154202
testCategory: Samples
155203
- name: mac_sample_tests
156-
pool:
157-
name: Azure Pipelines
158-
vmImage: $(HostedMacImage)
159-
os: macOS
204+
pool: ${{ parameters.MacOSPool }}
160205
timeout: 120
161206
testCategory: Samples
162207

163208
- name: win_wintemplate_tests
164-
pool: ${{ parameters.PackPlatform }}
209+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
210+
pool: ${{ parameters.WindowsPool.public }}
211+
runAsPublic: true
212+
${{ else }}:
213+
pool: ${{ parameters.WindowsPool.internal }}
214+
runAsPublic: false
165215
timeout: 120
166216
testCategory: WindowsTemplates
167217

168218
# - name: mac_wintemplate_tests
169-
# pool:
170-
# name: Azure Pipelines
171-
# vmImage: $(HostedMacImage)
172-
# os: macOS
219+
# pool: ${{ parameters.MacOSPool }}
173220
# timeout: 120
174221
# testCategory: WindowsTemplates
175222

176223
- name: win_buildtemplate_tests
177-
pool: ${{ parameters.PackPlatform }}
224+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
225+
pool: ${{ parameters.WindowsPool.public }}
226+
runAsPublic: true
227+
${{ else }}:
228+
pool: ${{ parameters.WindowsPool.internal }}
229+
runAsPublic: false
178230
timeout: 120
179231
testCategory: Build
180232
- name: mac_buildtemplate_tests
181-
pool:
182-
name: Azure Pipelines
183-
vmImage: $(HostedMacImage)
184-
os: macOS
233+
pool: ${{ parameters.MacOSPool }}
185234
timeout: 240
186235
testCategory: Build
187236

188237
- name: win_blazortemplate_tests
189-
pool: ${{ parameters.PackPlatform }}
238+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
239+
pool: ${{ parameters.WindowsPool.public }}
240+
runAsPublic: true
241+
${{ else }}:
242+
pool: ${{ parameters.WindowsPool.internal }}
243+
runAsPublic: false
190244
timeout: 120
191245
testCategory: Blazor
192246
- name: mac_blazortemplate_tests
193-
pool:
194-
name: Azure Pipelines
195-
vmImage: $(HostedMacImage)
196-
os: macOS
247+
pool: ${{ parameters.MacOSPool }}
197248
timeout: 120
198249
testCategory: Blazor
199250

200251
- name: win_multitemplate_tests
201-
pool: ${{ parameters.PackPlatform }}
252+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
253+
pool: ${{ parameters.WindowsPool.public }}
254+
runAsPublic: true
255+
${{ else }}:
256+
pool: ${{ parameters.WindowsPool.internal }}
257+
runAsPublic: false
202258
timeout: 120
203259
testCategory: MultiProject
204260
- name: mac_multitemplate_tests
205-
pool:
206-
name: Azure Pipelines
207-
vmImage: $(HostedMacImage)
208-
os: macOS
261+
pool: ${{ parameters.MacOSPool }}
209262
timeout: 120
210263
testCategory: MultiProject
211264

212265
# TODO: macOSTemplates and AOT template categories
213266

214267
- name: mac_runandroid_tests
215-
pool:
216-
name: Azure Pipelines
217-
vmImage: $(HostedMacImage)
218-
os: macOS
268+
pool: ${{ parameters.MacOSPool }}
219269
timeout: 180
220270
testCategory: RunOnAndroid
221271

222272
- name: mac_runios_tests
223-
pool:
224-
name: Azure Pipelines
225-
vmImage: $(HostedMacImage)
226-
os: macOS
273+
pool: ${{ parameters.MacOSPool }}
227274
timeout: 180
228-
testCategory: RunOniOS
275+
testCategory: RunOniOS

0 commit comments

Comments
 (0)