From 502d2ab29f7b63ab1e306146675787b05b5fceb7 Mon Sep 17 00:00:00 2001
From: ZelinWang <zelinwang@microsoft.com>
Date: Mon, 10 Mar 2025 16:33:52 +0800
Subject: [PATCH 1/2] {CI} Update Azure Pipelines to use latest Ubuntu pools

---
 .azure-pipelines/sync-alias.yml          | 6 +++++-
 .azure-pipelines/templates/variables.yml | 6 +++---
 azure-pipelines.yml                      | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/sync-alias.yml b/.azure-pipelines/sync-alias.yml
index 1f123cb406c..af8da714d8f 100644
--- a/.azure-pipelines/sync-alias.yml
+++ b/.azure-pipelines/sync-alias.yml
@@ -14,10 +14,14 @@ resources:
     type: git
     name: internal.wiki
 
+variables:
+- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
+
 jobs:
 - job: UpdateYaml
   displayName: Update resourceManagement.yml
-  pool: pool-windows-2019
+  pool: 
+    name: ${{ variables.windows_pool }}
   uses:
     repositories:
     - ServiceContactList
diff --git a/.azure-pipelines/templates/variables.yml b/.azure-pipelines/templates/variables.yml
index 0ce17e9dfa5..5267cc2f51e 100644
--- a/.azure-pipelines/templates/variables.yml
+++ b/.azure-pipelines/templates/variables.yml
@@ -1,6 +1,6 @@
 variables:
-  ubuntu_pool: 'pool-ubuntu-2004'
-  ubuntu_multi_core_pool: 'pool-ubuntu-2004-multi-core'
+  ubuntu_pool: 'pool-ubuntu-2204'
+  ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
   windows_pool: 'pool-windows-2019'
-  ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
+  ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
   macos_pool: 'macOS-14'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 73899815c33..3960b9c10c9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,10 +27,10 @@ parameters:
   default:
   - name: AMD64
     value: amd64
-    pool: pool-ubuntu-2004-multi-core
+    pool: pool-ubuntu-latest-multi-core
   - name: ARM64
     value: arm64
-    pool: ubuntu-arm64-2004-pool
+    pool: pool-ubuntu-latest-arm64
 
 jobs:
 - job: CheckPullRequest

From 47ed94ff0d94c0e3a79380e48a3cd3f7f070292a Mon Sep 17 00:00:00 2001
From: ZelinWang <zelinwang@microsoft.com>
Date: Mon, 10 Mar 2025 16:38:19 +0800
Subject: [PATCH 2/2] minor fix

---
 scripts/live_test/CLITest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/live_test/CLITest.yml b/scripts/live_test/CLITest.yml
index 77beb55c740..8bd19444b56 100644
--- a/scripts/live_test/CLITest.yml
+++ b/scripts/live_test/CLITest.yml
@@ -25,7 +25,7 @@ variables:
 stages:
 # Azure DevOps limits the number of jobs to 256, so it must be split according to the platform and placed in different stages.
 - stage: TestUbuntu
-  displayName: Live Test on Ubuntu 2004
+  displayName: Live Test on Ubuntu latest
   condition: succeededOrFailed()
   jobs:
   - job: LiveTest
@@ -455,7 +455,7 @@ stages:
           if [[ "$(USER_TARGET)" =~ "$(Target)" || ("$(USER_TARGET)" == "main" && ! "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "extensions" && "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "ALL" || "$(USER_TARGET)" == "all" || "$(USER_TARGET)" == "") ]]; then
             echo "Match!"
             echo "##vso[task.setvariable variable=Match]1"
-            echo "##vso[task.setvariable variable=platform]ubuntu2004"
+            echo "##vso[task.setvariable variable=platform]ubuntulatest"
           else
             echo "Not match!"
             echo "##vso[task.setvariable variable=Match]0"