From 2a703e66dad392d2c4fa62409ccd14d29ecfc898 Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Wed, 19 Apr 2023 18:17:11 -0400
Subject: [PATCH 1/2] [ci] Try hosted Linux build pool

---
 build-tools/automation/azure-pipelines.yaml            | 8 ++++++++
 build-tools/automation/yaml-templates/build-linux.yaml | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index e4786365fe3..33a803a02ae 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -71,6 +71,10 @@ variables:
     value: Azure Pipelines
   - name: MacBuildPoolImage
     value: internal-macos12
+  - name: LinuxBuildPoolName
+    value: android-devdiv-ubuntu-vmss
+  - name: LinuxBuildPoolImage
+    value: ''
 - ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), eq(variables['Build.Reason'], 'PullRequest')) }}:
   - name: MicroBuildSignType
     value: Test
@@ -78,6 +82,10 @@ variables:
     value: VSEng-Xamarin-RedmondMac-Android-Untrusted
   - name: MacBuildPoolImage
     value: ''
+  - name: LinuxBuildPoolName
+    value: Azure Pipelines
+  - name: LinuxBuildPoolImage
+    value: ubuntu-22.04
   - name: DisablePipelineConfigDetector
     value: true
 
diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml
index 92426376649..9e684725b90 100644
--- a/build-tools/automation/yaml-templates/build-linux.yaml
+++ b/build-tools/automation/yaml-templates/build-linux.yaml
@@ -1,5 +1,6 @@
 parameters:
-  buildPool: android-devdiv-ubuntu-vmss
+  buildPoolName: $(LinuxBuildPoolName)
+  buildPoolImage: $(LinuxBuildPoolImage)
   buildResultArtifactName: Build Results - Linux
   checkoutCommit: ''
   checkoutPath: 's/xamarin-android'
@@ -22,7 +23,9 @@ stages:
   jobs:
   - job: ${{ parameters.jobName }}
     displayName: ${{ parameters.jobDisplayName }}
-    pool: ${{ parameters.buildPool }}
+    pool:
+      name: ${{ parameters.buildPoolName }}
+      vmImage: ${{ parameters.buildPoolImage }}
     timeoutInMinutes: 180
     workspace:
       clean: all

From fdba30d0ecbdbcd2773ec87c838edb41915f5afb Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Mon, 24 Apr 2023 15:58:41 -0400
Subject: [PATCH 2/2] Test on hosted machines as well

---
 build-tools/automation/azure-pipelines.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 33a803a02ae..cfebc4d74d2 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -285,7 +285,8 @@ stages:
   # Check - "Xamarin.Android (Linux > Tests > MSBuild)"
   - job: linux_tests_smoke
     displayName: Linux > Tests > MSBuild
-    pool: android-devdiv-ubuntu-vmss
+    pool:
+      vmImage: ubuntu-22.04
     timeoutInMinutes: 180
     workspace:
       clean: all