Skip to content

Commit 285582f

Browse files
azure-sdkscbeddmikeharder
authored
Sync eng/common directory with azure-sdk-tools for PR 10953 (#41706)
* update all eng/common templates or scripts that utilize the old azsdk-pool-* to utilize the unified pool azsdk-pool * upgrade to target ubuntu 24.04 where applicable --------- Co-authored-by: Scott Beddall <scbedd@microsoft.com> Co-authored-by: Mike Harder <mharder@microsoft.com>
1 parent abbbfaf commit 285582f

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
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/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ parameters:
2727
default: []
2828
- name: Pool
2929
type: string
30-
default: azsdk-pool-mms-ubuntu-2204-general
30+
default: azsdk-pool
3131
- name: OsVmImage
3232
type: string
33-
default: ubuntu-22.04
33+
default: ubuntu-24.04
3434
# This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE.
3535
# When that occurs, provide a name other than the default value.
3636
- name: GenerateJobName

eng/common/pipelines/templates/jobs/docindex.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
jobs:
22
- job: CreateDocIndex
33
pool:
4-
name: azsdk-pool-mms-win-2022-general
4+
name: azsdk-pool
5+
demands: ImageOverride -equals windows-2022
56
steps:
67
- task: UsePythonVersion@0
78
displayName: 'Use Python 3.11'
@@ -36,14 +37,14 @@ jobs:
3637
Copy-Item -Path $(Build.SourcesDirectory)/eng/* -Destination ./ -Recurse -Force
3738
echo "##vso[task.setvariable variable=toolPath]$(Build.BinariesDirectory)"
3839
workingDirectory: $(Build.BinariesDirectory)
39-
displayName: Move eng/common to Tool Directory
40+
displayName: Move eng/common to Tool Directory
4041
4142
- task: PublishPipelineArtifact@0
4243
condition: succeeded()
4344
inputs:
4445
artifactName: "Doc.Index"
4546
targetPath: $(Build.ArtifactStagingDirectory)/docfx_project/_site
46-
47+
4748
- pwsh: |
4849
git checkout -b gh-pages-local --track origin/gh-pages-root -f
4950
workingDirectory: $(Build.SourcesDirectory)

eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ stages:
2525
strategy:
2626
matrix:
2727
Windows:
28-
Pool: azsdk-pool-mms-win-2022-general
28+
Pool: azsdk-pool
2929
Image: windows-2022
3030
Linux:
31-
Pool: azsdk-pool-mms-ubuntu-2204-general
32-
Image: ubuntu-22.04
31+
Pool: azsdk-pool
32+
Image: ubuntu-24.04
3333
Mac:
3434
Pool: Azure Pipelines
3535
Image: macos-latest
3636

3737
pool:
3838
name: $(Pool)
39-
vmImage: $(Image)
39+
demands: ImageOverride -equals $(Image)
4040

4141
steps:
4242
- ${{ parameters.PreTestSteps }}

0 commit comments

Comments
 (0)