Skip to content

Commit 2771ba3

Browse files
scbeddscbedd
committed
update remaining image versions
1 parent 744806c commit 2771ba3

15 files changed

+60
-58
lines changed

‎eng/common/pipelines/codeowners-linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ stages:
2727
- job: Run
2828
timeoutInMinutes: 120
2929
pool:
30-
name: azsdk-pool-mms-ubuntu-2204-general
31-
vmImage: ubuntu-22.04
30+
name: azsdk-pool
31+
demands: ImageOverride -equals ubuntu-24.04
3232

3333
variables:
3434
CodeownersLinterVersion: '1.0.0-dev.20240926.2'

‎eng/pipelines/aggregate-reports.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pr:
99
- eng/pipelines/aggregate-reports.yml
1010

1111
pool:
12-
name: azsdk-pool-mms-win-2022-general
13-
vmImage: MMS2022
12+
name: azsdk-pool
13+
demands: ImageOverride -equals windows-2022
1414

1515
variables:
1616
- template: ./templates/variables/globals.yml

‎eng/pipelines/generate-all-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
timeoutInMinutes: 120
1313

1414
pool:
15-
name: azsdk-pool-mms-ubuntu-2004-general
16-
vmImage: 'ubuntu-20.04'
15+
name: azsdk-pool
16+
demands: ImageOverride -equals 'ubuntu-24.04'
1717

1818
steps:
1919
- task: UsePythonVersion@0

‎eng/pipelines/templates/jobs/build-conda-dependencies.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
displayName: 'Build Windows Dependencies'
99
timeoutInMinutes: 90
1010
pool:
11-
name: azsdk-pool-mms-win-2022-general
12-
image: azsdk-pool-mms-win-2022-1espt
11+
name: azsdk-pool
12+
image: windows-2022
1313
os: windows
1414
variables:
1515
VS_INSTALLER_URL: "https://aka.ms/vs/17/release/vs_enterprise.exe"
@@ -84,8 +84,8 @@ jobs:
8484
displayName: 'Build Linux Dependencies'
8585
timeoutInMinutes: 90
8686
pool:
87-
name: azsdk-pool-mms-ubuntu-2004-general
88-
image: azsdk-pool-mms-ubuntu-2004-1espt
87+
name: azsdk-pool
88+
image: ubuntu-24.04
8989
os: linux
9090

9191
steps:

‎eng/pipelines/templates/jobs/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ jobs:
237237
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
238238
parameters:
239239
JobTemplatePath: /eng/pipelines/templates/jobs/ci.tests.yml
240-
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
241-
Pool: azsdk-pool-mms-ubuntu-2004-general
240+
OsVmImage: ubuntu-24.04
241+
Pool: azsdk-pool
242242
DependsOn:
243243
- 'Build_Linux'
244244
- 'Build_Windows'
@@ -286,8 +286,8 @@ jobs:
286286
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
287287
parameters:
288288
JobTemplatePath: /eng/pipelines/templates/jobs/regression.yml
289-
OsVmImage: azsdk-pool-mms-ubuntu-2004-1espt
290-
Pool: azsdk-pool-mms-ubuntu-2004-general
289+
OsVmImage: ubuntu-24.04
290+
Pool: azsdk-pool
291291
GenerateJobName: generate_regression_matrix
292292
SparseCheckoutPaths: [ "scripts/", "sdk/", "tools/azure-sdk-tools/" ]
293293
MatrixConfigs:

‎eng/pipelines/templates/jobs/run-cli-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
strategy:
3535
matrix:
3636
linux:
37-
imageName: 'ubuntu-20.04'
38-
poolName: 'azsdk-pool-mms-ubuntu-2004-general'
37+
imageName: 'ubuntu-24.04'
38+
poolName: 'azsdk-pool'
3939
# windows:
4040
# imageName: 'windows-2022'
41-
# poolName: 'azsdk-pool-mms-win-2022-general'
41+
# poolName: 'azsdk-pool'
4242
# mac:
4343
# imageName: 'macos-latest'
4444
# poolName: 'Azure Pipelines'
4545

4646
pool:
47-
vmImage: $(imageName)
47+
demands: ImageOverride -equals $(imageName)
4848
name: '$(poolName)'
4949

5050
steps:

‎eng/pipelines/templates/jobs/tests-nightly-python.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
timeoutInMinutes: 90
2222

2323
pool:
24-
name: 'azsdk-pool-mms-ubuntu-2004-general'
24+
name: 'azsdk-pool'
25+
demands: ImageOverride -equals 'ubuntu-24.04'
2526

2627
steps:
2728
- template: ../steps/release-candidate-steps.yml
@@ -35,7 +36,8 @@ jobs:
3536
timeoutInMinutes: 90
3637

3738
pool:
38-
name: 'azsdk-pool-mms-ubuntu-2004-general'
39+
name: 'azsdk-pool'
40+
demands: ImageOverride -equals 'ubuntu-24.04'
3941

4042
steps:
4143
- task: UsePythonVersion@0

‎eng/pipelines/templates/stages/1es-redirect.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ extends:
4242
isMainPipeline: true
4343
enableForGitHub: true
4444
sourceAnalysisPool:
45-
name: azsdk-pool-mms-win-2022-general
46-
image: azsdk-pool-mms-win-2022-1espt
45+
name: azsdk-pool
46+
image: windows-2022
4747
os: windows
4848
# Turn off the build warnings caused by disabling some sdl checks
4949
createAdoIssuesForJustificationsForDisablement: false

‎eng/pipelines/templates/stages/archetype-conda-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ stages:
1717
# environment: pypi
1818

1919
pool:
20-
name: azsdk-pool-mms-ubuntu-2004-general
21-
vmImage: 'ubuntu-20.04'
20+
name: 'azsdk-pool'
21+
demands: ImageOverride -equals 'ubuntu-24.04'
2222

2323
strategy:
2424
runOnce:

‎eng/pipelines/templates/stages/archetype-python-release.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ stages:
2727
condition: ne(variables['Skip.TagRepository'], 'true')
2828

2929
pool:
30-
image: azsdk-pool-mms-ubuntu-2004-1espt
31-
name: azsdk-pool-mms-ubuntu-2004-general
30+
image: ubuntu-24.04
31+
name: azsdk-pool
3232
os: linux
3333

3434
steps:
@@ -112,8 +112,8 @@ stages:
112112
targetPath: $(Pipeline.Workspace)/packages_extended
113113

114114
pool:
115-
image: azsdk-pool-mms-ubuntu-2004-1espt
116-
name: azsdk-pool-mms-ubuntu-2004-general
115+
image: ubuntu-24.04
116+
name: azsdk-pool
117117
os: linux
118118

119119
strategy:
@@ -133,14 +133,14 @@ stages:
133133
- pwsh: |
134134
$esrpDirectory = "$(Pipeline.Workspace)/esrp-release/${{parameters.ArtifactName}}/${{artifact.name}}"
135135
New-Item -ItemType Directory -Force -Path $esrpDirectory
136-
136+
137137
Get-ChildItem -Path "$(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}" `
138138
| Where-Object { ($_.Name -like "*.tar.gz" -or $_.Name -like "*.whl") } `
139139
| Copy-Item -Destination $esrpDirectory
140-
140+
141141
Get-ChildItem $esrpDirectory
142142
displayName: Isolate files for ESRP Publish
143-
143+
144144
- task: EsrpRelease@9
145145
displayName: 'Publish to ESRP'
146146
inputs:
@@ -157,13 +157,13 @@ stages:
157157
Approvers: $(Build.RequestedForEmail)
158158
ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
159159
MainPublisher: 'ESRPRELPACMANTEST'
160-
160+
161161
- ${{ if ne(parameters.PublicFeed, 'PyPi') }}:
162162
- task: TwineAuthenticate@0
163163
displayName: 'Authenticate to feed: ${{parameters.PublicFeed}}'
164164
inputs:
165165
artifactFeeds: ${{parameters.PublicFeed}}
166-
166+
167167
- script: |
168168
set -e
169169
twine upload --repository ${{parameters.PublicFeed}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}/*.whl
@@ -176,7 +176,7 @@ stages:
176176
displayName: 'Authenticate to feed: ${{parameters.DevFeedName}}'
177177
inputs:
178178
artifactFeeds: ${{parameters.DevFeedName}}
179-
179+
180180
- script: |
181181
set -e
182182
twine upload --repository ${{parameters.DevFeedName}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}/*.whl
@@ -190,8 +190,8 @@ stages:
190190
dependsOn: PublishPackage
191191

192192
pool:
193-
image: azsdk-pool-mms-ubuntu-2004-1espt
194-
name: azsdk-pool-mms-ubuntu-2004-general
193+
image: ubuntu-24.04
194+
name: azsdk-pool
195195
os: linux
196196

197197
steps:
@@ -221,8 +221,8 @@ stages:
221221
dependsOn: PublishPackage
222222

223223
pool:
224-
name: azsdk-pool-mms-win-2022-general
225-
image: azsdk-pool-mms-win-2022-1espt
224+
name: azsdk-pool
225+
image: windows-2022
226226
os: windows
227227

228228
steps:
@@ -259,8 +259,8 @@ stages:
259259
dependsOn: PublishPackage
260260

261261
pool:
262-
image: azsdk-pool-mms-ubuntu-2004-1espt
263-
name: azsdk-pool-mms-ubuntu-2004-general
262+
image: ubuntu-24.04
263+
name: azsdk-pool
264264
os: linux
265265

266266
steps:
@@ -299,8 +299,8 @@ stages:
299299
dependsOn: PublishPackage
300300

301301
pool:
302-
image: azsdk-pool-mms-ubuntu-2004-1espt
303-
name: azsdk-pool-mms-ubuntu-2004-general
302+
image: azsdk-pool
303+
name: ubuntu-24.04
304304
os: linux
305305

306306
steps:
@@ -342,8 +342,8 @@ stages:
342342
displayName: "Publish package to daily feed"
343343
condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal')))
344344
pool:
345-
image: azsdk-pool-mms-ubuntu-2004-1espt
346-
name: azsdk-pool-mms-ubuntu-2004-general
345+
image: ubuntu-240.04
346+
name: azsdk-pool
347347
os: linux
348348
steps:
349349
- download: current
@@ -380,8 +380,8 @@ stages:
380380
dependsOn: PublishPackages
381381
condition: and(succeeded(), or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'))))
382382
pool:
383-
image: azsdk-pool-mms-ubuntu-2004-1espt
384-
name: azsdk-pool-mms-ubuntu-2004-general
383+
image: ubuntu-24.04
384+
name: azsdk-pool
385385
os: linux
386386
steps:
387387
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml

0 commit comments

Comments
 (0)