Skip to content

Commit 131634d

Browse files
authored
{CI} Update Azure Pipelines to use Ubuntu 22.04 pools (Azure#30996)
* {CI} Update Azure Pipelines to use latest Ubuntu pools * minor fix
1 parent 4c5ba0e commit 131634d

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.azure-pipelines/sync-alias.yml

+5-1
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
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ubuntu_pool: 'pool-ubuntu-2004'
3-
ubuntu_multi_core_pool: 'pool-ubuntu-2004-multi-core'
2+
ubuntu_pool: 'pool-ubuntu-2204'
3+
ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
44
windows_pool: 'pool-windows-2019'
5-
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
5+
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
66
macos_pool: 'macOS-14'

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ parameters:
2727
default:
2828
- name: AMD64
2929
value: amd64
30-
pool: pool-ubuntu-2004-multi-core
30+
pool: pool-ubuntu-latest-multi-core
3131
- name: ARM64
3232
value: arm64
33-
pool: ubuntu-arm64-2004-pool
33+
pool: pool-ubuntu-latest-arm64
3434

3535
jobs:
3636
- job: CheckPullRequest

scripts/live_test/CLITest.yml

+2-2
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)