Skip to content

Commit ca5ff9b

Browse files
authored
[ci] Use hosted Linux build pool for PR builds (#7976)
We should use Microsoft hosted machines for PR builds wherever possible.
1 parent e4785b9 commit ca5ff9b

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,21 @@ variables:
7171
value: Azure Pipelines
7272
- name: MacBuildPoolImage
7373
value: internal-macos12
74+
- name: LinuxBuildPoolName
75+
value: android-devdiv-ubuntu-vmss
76+
- name: LinuxBuildPoolImage
77+
value: ''
7478
- ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), eq(variables['Build.Reason'], 'PullRequest')) }}:
7579
- name: MicroBuildSignType
7680
value: Test
7781
- name: MacBuildPoolName
7882
value: VSEng-Xamarin-RedmondMac-Android-Untrusted
7983
- name: MacBuildPoolImage
8084
value: ''
85+
- name: LinuxBuildPoolName
86+
value: Azure Pipelines
87+
- name: LinuxBuildPoolImage
88+
value: ubuntu-22.04
8189
- name: DisablePipelineConfigDetector
8290
value: true
8391

@@ -277,7 +285,8 @@ stages:
277285
# Check - "Xamarin.Android (Linux > Tests > MSBuild)"
278286
- job: linux_tests_smoke
279287
displayName: Linux > Tests > MSBuild
280-
pool: android-devdiv-ubuntu-vmss
288+
pool:
289+
vmImage: ubuntu-22.04
281290
timeoutInMinutes: 180
282291
workspace:
283292
clean: all

build-tools/automation/yaml-templates/build-linux.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
parameters:
2-
buildPool: android-devdiv-ubuntu-vmss
2+
buildPoolName: $(LinuxBuildPoolName)
3+
buildPoolImage: $(LinuxBuildPoolImage)
34
buildResultArtifactName: Build Results - Linux
45
checkoutCommit: ''
56
checkoutPath: 's/xamarin-android'
@@ -22,7 +23,9 @@ stages:
2223
jobs:
2324
- job: ${{ parameters.jobName }}
2425
displayName: ${{ parameters.jobDisplayName }}
25-
pool: ${{ parameters.buildPool }}
26+
pool:
27+
name: ${{ parameters.buildPoolName }}
28+
vmImage: ${{ parameters.buildPoolImage }}
2629
timeoutInMinutes: 180
2730
workspace:
2831
clean: all

0 commit comments

Comments
 (0)