diff --git a/build-tools/automation/azure-pipelines-apidocs.yaml b/build-tools/automation/azure-pipelines-apidocs.yaml index 6a17eedcdfc..5adceb3986c 100644 --- a/build-tools/automation/azure-pipelines-apidocs.yaml +++ b/build-tools/automation/azure-pipelines-apidocs.yaml @@ -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 diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index c09886ca432..352f23ad261 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -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 @@ -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 timeoutInMinutes: 120 workspace: @@ -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: diff --git a/build-tools/automation/yaml-templates/build-macos.yaml b/build-tools/automation/yaml-templates/build-macos.yaml index c279a6752ba..0a29943c4d8 100644 --- a/build-tools/automation/yaml-templates/build-macos.yaml +++ b/build-tools/automation/yaml-templates/build-macos.yaml @@ -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) diff --git a/build-tools/automation/yaml-templates/run-emulator-tests.yaml b/build-tools/automation/yaml-templates/run-emulator-tests.yaml index e3bac786ce3..cffa60b6b04 100644 --- a/build-tools/automation/yaml-templates/run-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/run-emulator-tests.yaml @@ -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: diff --git a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml index 98dbce3f8bc..7853353e798 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml @@ -23,7 +23,7 @@ jobs: ${{ if eq(parameters.testOS, 'macOS') }}: pool: name: Azure Pipelines - vmImage: $(HostedMacImage) + image: $(HostedMacImage) os: macOS timeoutInMinutes: 240 cancelTimeoutInMinutes: 5 diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 4a21510cb50..4dce9868bb4 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -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