Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Commit 9d063fc

Browse files
Revert "{CI} Update Azure Pipelines to use Ubuntu 22.04 pools (Azure#8543)"
This reverts commit 2245751.
1 parent 255927c commit 9d063fc

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

.azure-pipelines/sync-alias.yml

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

17-
variables:
18-
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
19-
2017
jobs:
2118
- job: UpdateYaml
2219
displayName: Update resourceManagement.yml
23-
pool:
24-
name: ${{ variables.windows_pool }}
20+
pool: pool-windows-2019
2521
uses:
2622
repositories:
2723
- 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-2204'
2+
ubuntu_pool: 'pool-ubuntu-2004'
33
windows_pool: 'pool-windows-2019'
4-
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
4+
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'

azure-pipelines.yml

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

15-
variables:
16-
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
17-
1815
jobs:
1916
- job: CredScan
2017
displayName: "Credential Scan"
2118
pool:
22-
name: ${{ variables.windows_pool }}
19+
name: 'pool-windows-2019'
2320
steps:
2421
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
2522
displayName: 'Run Credential Scanner'
@@ -37,7 +34,7 @@ jobs:
3734
- job: PolicyCheck
3835
displayName: "Policy Check"
3936
pool:
40-
name: ${{ variables.windows_pool }}
37+
name: 'pool-windows-2019'
4138
steps:
4239
- task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@2
4340
displayName: 'Run Policy Check'
@@ -54,7 +51,7 @@ jobs:
5451
- job: CheckLicenseHeader
5552
displayName: "Check License"
5653
pool:
57-
name: ${{ variables.ubuntu_pool }}
54+
name: 'pool-ubuntu-2004'
5855
steps:
5956
- task: UsePythonVersion@0
6057
displayName: 'Use Python 3.12'
@@ -70,7 +67,7 @@ jobs:
7067
- job: IndexVerify
7168
displayName: "Verify Extensions Index"
7269
pool:
73-
name: ${{ variables.ubuntu_pool }}
70+
name: 'pool-ubuntu-2004'
7471
steps:
7572
- task: UsePythonVersion@0
7673
displayName: 'Use Python 3.12'
@@ -87,7 +84,7 @@ jobs:
8784
- job: SourceTests
8885
displayName: "Integration Tests, Build Tests"
8986
pool:
90-
name: ${{ variables.ubuntu_pool }}
87+
name: 'pool-ubuntu-2004'
9188
strategy:
9289
matrix:
9390
Python39:
@@ -122,7 +119,7 @@ jobs:
122119
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
123120
continueOnError: true
124121
pool:
125-
name: ${{ variables.ubuntu_pool }}
122+
name: 'pool-ubuntu-2004'
126123
steps:
127124
- task: UsePythonVersion@0
128125
displayName: 'Use Python 3.12'
@@ -146,7 +143,7 @@ jobs:
146143
displayName: "azdev linter on Modified Extensions"
147144
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
148145
pool:
149-
name: ${{ variables.ubuntu_pool }}
146+
name: 'pool-ubuntu-2004'
150147
steps:
151148
- task: UsePythonVersion@0
152149
displayName: 'Use Python 3.12'
@@ -171,7 +168,7 @@ jobs:
171168
displayName: "azdev scan ( High Confidence ) on Modified Extensions"
172169
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
173170
pool:
174-
name: ${{ variables.ubuntu_pool }}
171+
name: 'pool-ubuntu-2004'
175172
steps:
176173
- task: UsePythonVersion@0
177174
displayName: 'Use Python 3.11'
@@ -202,7 +199,7 @@ jobs:
202199
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
203200
continueOnError: true
204201
pool:
205-
name: ${{ variables.ubuntu_pool }}
202+
name: 'pool-ubuntu-2004'
206203
steps:
207204
- task: UsePythonVersion@0
208205
displayName: 'Use Python 3.11'
@@ -231,7 +228,7 @@ jobs:
231228
# displayName: "Verify Ref Docs"
232229
# continueOnError: true
233230
# pool:
234-
# name: ${{ variables.ubuntu_pool }}
231+
# name: 'pool-ubuntu-2004'
235232
# steps:
236233
# - task: UsePythonVersion@0
237234
# displayName: 'Use Python 3.12'
@@ -248,7 +245,7 @@ jobs:
248245
- job: CheckInit
249246
displayName: "Check Init Files"
250247
pool:
251-
name: ${{ variables.ubuntu_pool }}
248+
name: 'pool-ubuntu-2004'
252249
steps:
253250
- task: UsePythonVersion@0
254251
displayName: 'Use Python 3.x'

0 commit comments

Comments
 (0)