From 78e74d81e1b9fae878595392879bac622bdc1da3 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Tue, 21 Apr 2026 18:03:29 -0400 Subject: [PATCH] Move latest open Android queues from 29 to 36 --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 2 +- eng/pipelines/helix-platforms.yml | 4 ++-- eng/pipelines/libraries/helix-queues-setup.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 85ab4859a020ef..20cc083c6ea956 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -56,7 +56,7 @@ jobs: # Android x64 - ${{ if in(parameters.platform, 'android_x64') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - Ubuntu.2204.Amd64.Android.29.Open + - Ubuntu.2204.Amd64.Android.36.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Ubuntu.2204.Amd64.Android.29 diff --git a/eng/pipelines/helix-platforms.yml b/eng/pipelines/helix-platforms.yml index dbceeb4b25eca2..07c1846ed15317 100644 --- a/eng/pipelines/helix-platforms.yml +++ b/eng/pipelines/helix-platforms.yml @@ -284,9 +284,9 @@ variables: value: Windows.10.Amd64.Android.Open # Android on Ubuntu (x86/x64) - # Latest: API 29 + # Latest: API 36 - name: helix_android_ubuntu_latest - value: Ubuntu.2204.Amd64.Android.29.Open + value: Ubuntu.2204.Amd64.Android.36.Open # Oldest: API 21 - name: helix_android_ubuntu_oldest diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index e31984c960aedf..878477cccebda8 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -87,9 +87,9 @@ jobs: # Use the Ubuntu-based Android queue for x86/x64/bionic_x64 on all projects, # and also for arm/arm64/bionic_arm/bionic_arm64 on non-public projects (no internal Windows Android queue). - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}: - - Ubuntu.2204.Amd64.Android.29.Open + - Ubuntu.2204.Amd64.Android.36.Open - ${{ if and(ne(variables['System.TeamProject'], 'public'), in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64')) }}: - - Ubuntu.2204.Amd64.Android.29.Open + - Ubuntu.2204.Amd64.Android.36.Open - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64')) }}: - Windows.11.Amd64.Android.Open