From dbea5d4b8f3371c3cb278e0c7f928cc915a7fcfc Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Mon, 26 Aug 2024 09:29:51 +0200
Subject: [PATCH 1/2] add Android API 21-32 emulator queues

---
 .../coreclr/templates/helix-queues-setup.yml         | 11 +++++++++++
 eng/pipelines/libraries/helix-queues-setup.yml       | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
index a9dae35f177eb..a669c155fa6db 100644
--- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml
+++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -46,7 +46,18 @@ jobs:
 
     # Android x64
     - ${{ if in(parameters.platform, 'android_x64') }}:
+      - Ubuntu.2204.Amd64.Android.21.Open
+      - Ubuntu.2204.Amd64.Android.22.Open
+      - Ubuntu.2204.Amd64.Android.23.Open
+      - Ubuntu.2204.Amd64.Android.24.Open
+      - Ubuntu.2204.Amd64.Android.25.Open
+      - Ubuntu.2204.Amd64.Android.26.Open
+      - Ubuntu.2204.Amd64.Android.27.Open
+      - Ubuntu.2204.Amd64.Android.28.Open
       - Ubuntu.2204.Amd64.Android.29.Open
+      - Ubuntu.2204.Amd64.Android.30.Open
+      - Ubuntu.2204.Amd64.Android.31.Open
+      - Ubuntu.2204.Amd64.Android.32.Open
 
     # Browser wasm
     - ${{ if eq(parameters.platform, 'browser_wasm') }}:
diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 3d4185b933888..f77da85958256 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -95,7 +95,19 @@ jobs:
 
     # Android
     - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
+      - Ubuntu.2204.Amd64.Android.21.Open
+      - Ubuntu.2204.Amd64.Android.22.Open
+      - Ubuntu.2204.Amd64.Android.23.Open
+      - Ubuntu.2204.Amd64.Android.24.Open
+      - Ubuntu.2204.Amd64.Android.25.Open
+      - Ubuntu.2204.Amd64.Android.26.Open
+      - Ubuntu.2204.Amd64.Android.27.Open
+      - Ubuntu.2204.Amd64.Android.28.Open
       - Ubuntu.2204.Amd64.Android.29.Open
+      - Ubuntu.2204.Amd64.Android.30.Open
+    - ${{ if in(parameters.platform, 'Android_x64') }}: # there's no x86 emulator image anymore since Android 31
+      - Ubuntu.2204.Amd64.Android.31.Open
+      - Ubuntu.2204.Amd64.Android.32.Open
     - ${{ if in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64') }}:
       - Windows.11.Amd64.Android.Open
 

From 41171cfb829495965afda60275d517d595fea2ee Mon Sep 17 00:00:00 2001
From: Matous Kozak <matouskozak@seznam.cz>
Date: Mon, 26 Aug 2024 13:17:26 +0200
Subject: [PATCH 2/2] increase time-limit for android jobs

---
 .../runtime-extra-platforms-androidemulator.yml |  6 +++---
 eng/pipelines/runtime-androidemulator.yml       | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
index 4badaf93186c0..4040219eea714 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
@@ -38,7 +38,7 @@ jobs:
       nameSuffix: AllSubsets_Mono_RuntimeTests
       runtimeVariant: minijit
       buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
+      timeoutInMinutes: 1800
       # extra steps, run tests
       postBuildSteps:
         - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
@@ -77,7 +77,7 @@ jobs:
       nameSuffix: AllSubsets_Mono_RuntimeTests_Interp
       runtimeVariant: monointerpreter
       buildArgs: -s mono+libs -c $(_BuildConfig)
-      timeoutInMinutes: 240
+      timeoutInMinutes: 1800
       # extra steps, run tests
       postBuildSteps:
         - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
@@ -111,7 +111,7 @@ jobs:
       nameSuffix: AllSubsets_Mono
       isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
       buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg)
-      timeoutInMinutes: 180
+      timeoutInMinutes: 1800
       # extra steps, run tests
       postBuildSteps:
         - template: /eng/pipelines/libraries/helix.yml
diff --git a/eng/pipelines/runtime-androidemulator.yml b/eng/pipelines/runtime-androidemulator.yml
index d54ac082ab1ac..e27ae68a63528 100644
--- a/eng/pipelines/runtime-androidemulator.yml
+++ b/eng/pipelines/runtime-androidemulator.yml
@@ -3,7 +3,22 @@
 # point the pipeline in azdo UI to this, and thus avoid any scheduled
 # triggers
 
-trigger: none
+trigger: 
+  branches:
+    include:
+    - release/*.*
+  paths:
+    include:
+    - '*'
+
+pr:
+  branches:
+    include:
+    - main
+    - release/*.*
+  paths:
+    include:
+    - '*'
 
 variables:
   - template: /eng/pipelines/common/variables.yml