Skip to content

Commit c6812ff

Browse files
wangzelin007jiasli
authored andcommitted
{CI} Update Azure Pipelines to use Ubuntu 22.04 pools (#30996)
(cherry picked from commit 131634d)
1 parent b63ab72 commit c6812ff

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.azure-pipelines/sync-alias.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ resources:
1414
type: git
1515
name: internal.wiki
1616

17+
variables:
18+
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
19+
1720
jobs:
1821
- job: UpdateYaml
1922
displayName: Update resourceManagement.yml
20-
pool: pool-windows-2019
23+
pool:
24+
name: ${{ variables.windows_pool }}
2125
uses:
2226
repositories:
2327
- ServiceContactList
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
ubuntu_pool: 'pool-ubuntu-2004'
2+
ubuntu_pool: 'pool-ubuntu-2204'
33
windows_pool: 'pool-windows-2019'
4-
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
4+
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
55
macos_pool: 'macOS-14'

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ parameters:
2525
default:
2626
- name: AMD64
2727
value: amd64
28-
pool: pool-ubuntu-2004
28+
pool: pool-ubuntu-latest-multi-core
2929
- name: ARM64
3030
value: arm64
31-
pool: ubuntu-arm64-2004-pool
31+
pool: pool-ubuntu-latest-arm64
3232

3333
jobs:
3434
- job: CheckPullRequest

scripts/live_test/CLITest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
stages:
2626
# Azure DevOps limits the number of jobs to 256, so it must be split according to the platform and placed in different stages.
2727
- stage: TestUbuntu
28-
displayName: Live Test on Ubuntu 2004
28+
displayName: Live Test on Ubuntu latest
2929
condition: succeededOrFailed()
3030
jobs:
3131
- job: LiveTest
@@ -455,7 +455,7 @@ stages:
455455
if [[ "$(USER_TARGET)" =~ "$(Target)" || ("$(USER_TARGET)" == "main" && ! "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "extensions" && "$(Target)" =~ ^ext-.*) || ("$(USER_TARGET)" == "ALL" || "$(USER_TARGET)" == "all" || "$(USER_TARGET)" == "") ]]; then
456456
echo "Match!"
457457
echo "##vso[task.setvariable variable=Match]1"
458-
echo "##vso[task.setvariable variable=platform]ubuntu2004"
458+
echo "##vso[task.setvariable variable=platform]ubuntulatest"
459459
else
460460
echo "Not match!"
461461
echo "##vso[task.setvariable variable=Match]0"

0 commit comments

Comments
 (0)