Skip to content

Commit 492d42c

Browse files
committed
{CI} Update Azure Pipelines to use latest Ubuntu pools
1 parent c7bd51b commit 492d42c

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
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,4 +1,4 @@
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'

azure-pipelines.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ pr:
1212
include:
1313
- '*'
1414

15+
variables:
16+
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
17+
1518
jobs:
1619
- job: CredScan
1720
displayName: "Credential Scan"
1821
pool:
19-
name: 'pool-windows-2019'
22+
name: ${{ variables.windows_pool }}
2023
steps:
2124
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
2225
displayName: 'Run Credential Scanner'
@@ -34,7 +37,7 @@ jobs:
3437
- job: PolicyCheck
3538
displayName: "Policy Check"
3639
pool:
37-
name: 'pool-windows-2019'
40+
name: ${{ variables.windows_pool }}
3841
steps:
3942
- task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
4043
displayName: 'Run Policy Check'
@@ -51,7 +54,7 @@ jobs:
5154
- job: CheckLicenseHeader
5255
displayName: "Check License"
5356
pool:
54-
name: 'pool-ubuntu-2004'
57+
name: ${{ variables.ubuntu_pool }}
5558
steps:
5659
- task: UsePythonVersion@0
5760
displayName: 'Use Python 3.12'
@@ -67,7 +70,7 @@ jobs:
6770
- job: IndexVerify
6871
displayName: "Verify Extensions Index"
6972
pool:
70-
name: 'pool-ubuntu-2004'
73+
name: ${{ variables.ubuntu_pool }}
7174
steps:
7275
- task: UsePythonVersion@0
7376
displayName: 'Use Python 3.12'
@@ -84,7 +87,7 @@ jobs:
8487
- job: SourceTests
8588
displayName: "Integration Tests, Build Tests"
8689
pool:
87-
name: 'pool-ubuntu-2004'
90+
name: ${{ variables.ubuntu_pool }}
8891
strategy:
8992
matrix:
9093
Python39:
@@ -119,7 +122,7 @@ jobs:
119122
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
120123
continueOnError: true
121124
pool:
122-
name: 'pool-ubuntu-2004'
125+
name: ${{ variables.ubuntu_pool }}
123126
steps:
124127
- task: UsePythonVersion@0
125128
displayName: 'Use Python 3.12'
@@ -143,7 +146,7 @@ jobs:
143146
displayName: "azdev linter on Modified Extensions"
144147
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
145148
pool:
146-
name: 'pool-ubuntu-2004'
149+
name: ${{ variables.ubuntu_pool }}
147150
steps:
148151
- task: UsePythonVersion@0
149152
displayName: 'Use Python 3.12'
@@ -168,7 +171,7 @@ jobs:
168171
displayName: "azdev scan ( High Confidence ) on Modified Extensions"
169172
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
170173
pool:
171-
name: 'pool-ubuntu-2004'
174+
name: ${{ variables.ubuntu_pool }}
172175
steps:
173176
- task: UsePythonVersion@0
174177
displayName: 'Use Python 3.11'
@@ -199,7 +202,7 @@ jobs:
199202
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
200203
continueOnError: true
201204
pool:
202-
name: 'pool-ubuntu-2004'
205+
name: ${{ variables.ubuntu_pool }}
203206
steps:
204207
- task: UsePythonVersion@0
205208
displayName: 'Use Python 3.11'
@@ -228,7 +231,7 @@ jobs:
228231
# displayName: "Verify Ref Docs"
229232
# continueOnError: true
230233
# pool:
231-
# name: 'pool-ubuntu-2004'
234+
# name: ${{ variables.ubuntu_pool }}
232235
# steps:
233236
# - task: UsePythonVersion@0
234237
# displayName: 'Use Python 3.12'
@@ -245,7 +248,7 @@ jobs:
245248
- job: CheckInit
246249
displayName: "Check Init Files"
247250
pool:
248-
name: 'pool-ubuntu-2004'
251+
name: ${{ variables.ubuntu_pool }}
249252
steps:
250253
- task: UsePythonVersion@0
251254
displayName: 'Use Python 3.x'

0 commit comments

Comments
 (0)