Skip to content

Commit 0ab9c50

Browse files
rmarinhormarinho
authored
[ci] Fix public vs internal aces (dotnet#33816)
### Description of Change ACES doesn t existing on the internal dnceng so we need to keep what we had. This pull request updates the Azure Pipelines configuration for macOS jobs to simplify pool selection and improve flexibility. The main change is the removal of the separate `MacOSPoolArm64` parameter and the introduction of conditional logic to select between internal and public macOS pools based on the build definition. This allows all macOS test and build stages to use a unified pool configuration, streamlining maintenance and making it easier to manage resources for different build scenarios. Key changes: **Pipeline Pool Configuration:** * Removed the `MacOSPoolArm64` parameter and consolidated macOS pool definitions into a single `MacOSPool` parameter with `internal` and `public` options. **Conditional Pool Selection in Stages:** * Updated all macOS-related stages (unit tests, sample tests, template tests, and iOS/Android test jobs) to use conditional logic for pool selection: if the build is for `'maui-pr'`, the `public` pool is used; otherwise, the `internal` pool is used. [[1]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L208-R206) [[2]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L229-R230) [[3]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L258-R262) [[4]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L272-R279) [[5]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L286-R347) [[6]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L331-R417)
2 parents 5c4b066 + 801d5c1 commit 0ab9c50

1 file changed

Lines changed: 80 additions & 31 deletions

File tree

‎eng/pipelines/ci.yml‎

Lines changed: 80 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,16 @@ parameters:
9898
- name: MacOSPool
9999
type: object
100100
default:
101-
name: AcesShared
102-
demands:
101+
internal:
102+
name: Azure Pipelines
103+
vmImage: $(HostedMacImage)
104+
label: macOS
105+
public:
106+
name: AcesShared
107+
demands:
103108
- ImageOverride -equals ACES_VM_SharedPool_Tahoe
104-
os: macOS
105-
label: macOS
109+
label: macOS
106110

107-
# ARM64 macOS pool (Apple Silicon)
108-
- name: MacOSPoolArm64
109-
type: object
110-
default:
111-
name: AcesShared
112-
demands:
113-
- ImageOverride -equals ACES_VM_SharedPool_Tahoe
114-
os: macOS
115-
label: macOS-arm64
116111

117112
# Condition for MacOSPool comparison lanes (non-ARM64)
118113
# Runs on: (non-PR on main/net*.0/release/*/inflight/*) OR (PR targeting net*.0/release/*/inflight/*)
@@ -205,7 +200,10 @@ stages:
205200
buildscript: $(_buildScript)
206201
- name: mac_unit_tests
207202
displayName: macOS Unit Tests
208-
pool: ${{ parameters.MacOSPoolArm64 }}
203+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
204+
pool: ${{ parameters.MacOSPool.public }}
205+
${{ else }}:
206+
pool: ${{ parameters.MacOSPool.internal }}
209207
timeout: 90
210208
testOS: macOS
211209
buildscript: $(_buildScriptMacOS)
@@ -226,7 +224,10 @@ stages:
226224
timeout: 120
227225
testCategory: Samples
228226
- name: mac_sample_tests
229-
pool: ${{ parameters.MacOSPoolArm64 }}
227+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
228+
pool: ${{ parameters.MacOSPool.public }}
229+
${{ else }}:
230+
pool: ${{ parameters.MacOSPool.internal }}
230231
timeout: 240
231232
testCategory: Samples
232233

@@ -255,7 +256,10 @@ stages:
255256
timeout: 120
256257
testCategory: Build
257258
- name: mac_buildtemplate_tests
258-
pool: ${{ parameters.MacOSPool }}
259+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
260+
pool: ${{ parameters.MacOSPool.public }}
261+
${{ else }}:
262+
pool: ${{ parameters.MacOSPool.internal }}
259263
timeout: 240
260264
testCategory: Build
261265

@@ -269,7 +273,10 @@ stages:
269273
timeout: 120
270274
testCategory: Blazor
271275
- name: mac_blazortemplate_tests
272-
pool: ${{ parameters.MacOSPoolArm64 }}
276+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
277+
pool: ${{ parameters.MacOSPool.public }}
278+
${{ else }}:
279+
pool: ${{ parameters.MacOSPool.internal }}
273280
timeout: 240
274281
testCategory: Blazor
275282

@@ -283,40 +290,61 @@ stages:
283290
timeout: 120
284291
testCategory: MultiProject
285292
- name: mac_multitemplate_tests
286-
pool: ${{ parameters.MacOSPoolArm64 }}
293+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
294+
pool: ${{ parameters.MacOSPool.public }}
295+
${{ else }}:
296+
pool: ${{ parameters.MacOSPool.internal }}
287297
timeout: 120
288298
testCategory: MultiProject
289299

290300
# TODO: macOSTemplates and AOT template categories
291301
- name: mac_runandroid_tests
292-
pool: ${{ parameters.MacOSPool }}
302+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
303+
pool: ${{ parameters.MacOSPool.public }}
304+
${{ else }}:
305+
pool: ${{ parameters.MacOSPool.internal }}
293306
timeout: 240
294307
testCategory: RunOnAndroid
295308

296309
# RunOniOS - Individual test methods run in parallel
297310
# ARM64 (Apple Silicon) lanes - using MacOSPoolArm64
298311
- name: mac_runios_maui_debug_arm64
299-
pool: ${{ parameters.MacOSPoolArm64 }}
312+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
313+
pool: ${{ parameters.MacOSPool.public }}
314+
${{ else }}:
315+
pool: ${{ parameters.MacOSPool.internal }}
300316
timeout: 45
301317
testName: RunOniOS_MauiDebug
302318

303319
- name: mac_runios_maui_release_arm64
304-
pool: ${{ parameters.MacOSPoolArm64 }}
320+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
321+
pool: ${{ parameters.MacOSPool.public }}
322+
${{ else }}:
323+
pool: ${{ parameters.MacOSPool.internal }}
305324
timeout: 45
306325
testName: RunOniOS_MauiRelease
307326

308327
- name: mac_runios_maui_trim_arm64
309-
pool: ${{ parameters.MacOSPoolArm64 }}
328+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
329+
pool: ${{ parameters.MacOSPool.public }}
330+
${{ else }}:
331+
pool: ${{ parameters.MacOSPool.internal }}
310332
timeout: 45
311333
testName: RunOniOS_MauiReleaseTrimFull
312334

313335
- name: mac_runios_blazor_debug_arm64
314-
pool: ${{ parameters.MacOSPoolArm64 }}
336+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
337+
pool: ${{ parameters.MacOSPool.public }}
338+
${{ else }}:
339+
pool: ${{ parameters.MacOSPool.internal }}
315340
timeout: 45
316341
testName: RunOniOS_BlazorDebug
317342

318343
- name: mac_runios_blazor_release_arm64
319-
pool: ${{ parameters.MacOSPoolArm64 }}
344+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
345+
pool: ${{ parameters.MacOSPool.public }}
346+
${{ else }}:
347+
pool: ${{ parameters.MacOSPool.internal }}
320348
timeout: 45
321349
testName: RunOniOS_BlazorRelease
322350

@@ -328,44 +356,65 @@ stages:
328356
# testName: RunOniOS_BlazorReleaseTrimFull
329357

330358
- name: mac_runios_nativeaot_arm64
331-
pool: ${{ parameters.MacOSPoolArm64 }}
359+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
360+
pool: ${{ parameters.MacOSPool.public }}
361+
${{ else }}:
362+
pool: ${{ parameters.MacOSPool.internal }}
332363
timeout: 45
333364
testName: RunOniOS_MauiNativeAOT
334365

335366
# MacOSPool lanes - comparison with ARM64 pool
336367
# Only run on: (non-PR on main/net*.0/release/*/inflight/*) OR (PR targeting net*.0/release/*/inflight/*)
337368
- name: mac_runios_maui_debug
338-
pool: ${{ parameters.MacOSPool }}
369+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
370+
pool: ${{ parameters.MacOSPool.public }}
371+
${{ else }}:
372+
pool: ${{ parameters.MacOSPool.internal }}
339373
timeout: 45
340374
testName: RunOniOS_MauiDebug
341375
condition: ${{ parameters.macOSPoolLaneCondition }}
342376

343377
- name: mac_runios_maui_release
344-
pool: ${{ parameters.MacOSPool }}
378+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
379+
pool: ${{ parameters.MacOSPool.public }}
380+
${{ else }}:
381+
pool: ${{ parameters.MacOSPool.internal }}
345382
timeout: 45
346383
testName: RunOniOS_MauiRelease
347384
condition: ${{ parameters.macOSPoolLaneCondition }}
348385

349386
- name: mac_runios_maui_trim
350-
pool: ${{ parameters.MacOSPool }}
387+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
388+
pool: ${{ parameters.MacOSPool.public }}
389+
${{ else }}:
390+
pool: ${{ parameters.MacOSPool.internal }}
351391
timeout: 45
352392
testName: RunOniOS_MauiReleaseTrimFull
353393
condition: ${{ parameters.macOSPoolLaneCondition }}
354394

355395
- name: mac_runios_blazor_debug
356-
pool: ${{ parameters.MacOSPool }}
396+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
397+
pool: ${{ parameters.MacOSPool.public }}
398+
${{ else }}:
399+
pool: ${{ parameters.MacOSPool.internal }}
357400
timeout: 45
358401
testName: RunOniOS_BlazorDebug
359402
condition: ${{ parameters.macOSPoolLaneCondition }}
360403

361404
- name: mac_runios_blazor_release
362-
pool: ${{ parameters.MacOSPool }}
405+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
406+
pool: ${{ parameters.MacOSPool.public }}
407+
${{ else }}:
408+
pool: ${{ parameters.MacOSPool.internal }}
363409
timeout: 45
364410
testName: RunOniOS_BlazorRelease
365411
condition: ${{ parameters.macOSPoolLaneCondition }}
366412

367413
- name: mac_runios_nativeaot
368-
pool: ${{ parameters.MacOSPool }}
414+
${{ if eq(variables['Build.DefinitionName'], 'maui-pr') }}:
415+
pool: ${{ parameters.MacOSPool.public }}
416+
${{ else }}:
417+
pool: ${{ parameters.MacOSPool.internal }}
369418
timeout: 45
370419
testName: RunOniOS_MauiNativeAOT
371420
condition: ${{ parameters.macOSPoolLaneCondition }}

0 commit comments

Comments
 (0)