Skip to content

[ci] Upgrade on-prem macOS pool to macOS-14 Sonoma #9477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjcollins merged 10 commits into from
Nov 8, 2024
Merged

[ci] Upgrade on-prem macOS pool to macOS-14 Sonoma #9477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
444affd
[ci] Upgrade on-prem macOS pool to macOS-14 Sonoma
pjcollins Oct 31, 2024
d193f55
Update arm64 agent demand
pjcollins Oct 31, 2024
2a35c6d
Bump monodroid with cmake update
pjcollins Oct 31, 2024
e479dca
Try to run msbuild tests on shared pool
pjcollins Oct 31, 2024
31f23a3
Set os param for 1espt
pjcollins Nov 1, 2024
98411c0
Bump monodroid
pjcollins Nov 1, 2024
88f3bee
Do not run msbuild tests on shared pool
pjcollins Nov 6, 2024
9643443
Update msbuild test agent count
pjcollins Nov 7, 2024
afc8417
Revert agent count changes
pjcollins Nov 7, 2024
cc7a7f5
Merge remote-tracking branch 'origin/main' into dev/pjc/pr-arm-sonoma
pjcollins Nov 7, 2024
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
6 changes: 3 additions & 3 deletions build-tools/automation/azure-pipelines-apidocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ stages:
- job: mac_build_update_docs
displayName: Update API Docs
pool:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- macOS.Name -equals $(SharedMacName)
- Agent.OSArchitecture -equals $(SharedMacArch)
timeoutInMinutes: 120
workspace:
clean: all
Expand Down
14 changes: 7 additions & 7 deletions build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ stages:
- job: mac_build_create_installers
displayName: macOS > Create Installers
pool:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- macOS.Name -equals $(SharedMacName)
- Agent.OSArchitecture -equals $(SharedMacArch)
timeoutInMinutes: 420
workspace:
clean: all
Expand Down Expand Up @@ -185,9 +185,9 @@ stages:
strategy:
parallel: 3
pool:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Name -equals $(SharedMacName)
- macOS.Architecture -equals x64
Copy link
Contributor

@jpobst jpobst Nov 7, 2024

Choose a reason for hiding this comment

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

I assume we are intentionally keeping the tests on x64?

Out of curiosity, did you try arm64? Was there an issue? Were they faster/slower?

Copy link
Member Author

@pjcollins pjcollins Nov 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm planning to revisit this for the MSBuild and emulator test jobs on both our regular CI and nightly. I don't have the full set of issues I've ran into with different machines in the past but wanted to leave this unchanged for now and look at upgrading most of the test stages separately. The Apple silicon machines definitely seem to be faster, at least for our build stages.

timeoutInMinutes: 120
workspace:
Expand Down Expand Up @@ -241,9 +241,9 @@ stages:
strategy:
parallel: 6
pool:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Name -equals $(SharedMacName)
- macOS.Architecture -equals x64
timeoutInMinutes: 150
workspace:
Expand Down
6 changes: 3 additions & 3 deletions build-tools/automation/yaml-templates/build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ stages:
displayName: ${{ parameters.jobDisplayName }}
pool:
${{ if or(eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR'), eq(variables['Build.DefinitionName'], 'Xamarin.Android Nightly')) }}:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- macOS.Name -equals $(SharedMacName)
- Agent.OSArchitecture -equals $(SharedMacArch)
${{ else }}:
name: Azure Pipelines
vmImage: $(HostedMacImage)
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/run-emulator-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
- job: mac_${{ parameters.jobName }}_tests
displayName: ${{ parameters.jobName }} Emulator Tests
pool:
name: VSEng-VSMac-Xamarin-Shared
name: $(SharedMacPool)
demands:
- macOS.Name -equals Ventura
- macOS.Name -equals $(SharedMacName)
- macOS.Architecture -equals x64
timeoutInMinutes: ${{ parameters.jobTimeout }}
workspace:
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/run-msbuild-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
${{ if eq(parameters.testOS, 'macOS') }}:
pool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
image: $(HostedMacImage)
os: macOS
timeoutInMinutes: 240
cancelTimeoutInMinutes: 5
Expand Down
6 changes: 6 additions & 0 deletions build-tools/automation/yaml-templates/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ variables:
value: $(github--pat--vs-mobiletools-engineering-service2)
- name: HostedMacImage
value: macOS-14
- name: SharedMacPool
value: VSEng-VSMac-Xamarin-Shared
- name: SharedMacName
value: Sonoma
- name: SharedMacArch
value: arm64
- name: HostedWinImage
value: windows-2022
- name: WindowsPoolImage1ESPT
Expand Down