Skip to content

Update to new agent pools #1932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 23, 2025
Merged

Update to new agent pools #1932

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f6f9f02
Update to new agent pools
weshaggard Jun 23, 2025
e98e1d5
Update globals.yml
weshaggard Jun 23, 2025
21b5b50
Update aggregate-reports.yml
weshaggard Jun 23, 2025
a55cba3
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
e0fc4c9
Update archetype-android-release.yml
weshaggard Jun 23, 2025
56eb38e
Update image.yml
weshaggard Jun 23, 2025
1b096ab
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
2885a2f
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
965d11d
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
1fb15a5
Update archetype-android-release.yml
weshaggard Jun 23, 2025
c1d48d4
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
0842bab
Update archetype-sdk-client.yml
weshaggard Jun 23, 2025
fd1c763
Update archetype-android-release.yml
weshaggard Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions eng/pipelines/aggregate-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pr:

variables:
- template: /eng/pipelines/templates/variables/globals.yml
- template: /eng/pipelines/templates/variables/image.yml

stages:
- stage: AggregateReports
Expand All @@ -22,8 +23,8 @@ stages:
- template: /eng/pipelines/templates/variables/globals.yml

pool:
name: $(Pool)
vmImage: $(OSVmImage)
name: $(LINUXPOOL)
demands: ImageOverride -equals $(LINUXIMAGE)

steps:
- task: Gradle@3
Expand Down
13 changes: 7 additions & 6 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ jobs:

variables:
- template: /eng/pipelines/templates/variables/globals.yml
- template: /eng/pipelines/templates/variables/image.yml

pool:
name: $(Pool)
image: $(OSVmImage)
name: $(LINUXPOOL)
image: $(LINUXIMAGE)
os: linux

steps:
Expand Down Expand Up @@ -38,8 +39,8 @@ jobs:
- template: /eng/pipelines/templates/variables/globals.yml

pool:
name: $(Pool)
image: $(OSVmImage)
name: $(LINUXPOOL)
image: $(LINUXIMAGE)
os: linux

steps:
Expand Down Expand Up @@ -92,8 +93,8 @@ jobs:
- template: /eng/pipelines/templates/variables/globals.yml

pool:
name: $(Pool)
image: $(OSVmImage)
name: $(LINUXPOOL)
image: $(LINUXIMAGE)
os: linux

steps:
Expand Down
19 changes: 10 additions & 9 deletions eng/pipelines/templates/stages/archetype-android-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ stages:
- job: SignPackage
timeoutInMinutes: 20
pool:
name: azsdk-pool-mms-win-2022-general
image: azsdk-pool-mms-win-2022-1espt
name: $(WINDOWSPOOL)
image: $(WINDOWSIMAGE)
os: windows
steps:
- checkout: azure-sdk-build-tools
Expand Down Expand Up @@ -107,8 +107,8 @@ stages:
- VerifyReleaseVersion

pool:
name: azsdk-pool-mms-win-2022-general
image: azsdk-pool-mms-win-2022-1espt
name: $(WINDOWSPOOL)
image: $(WINDOWSIMAGE)
os: windows
steps:
- checkout: self
Expand Down Expand Up @@ -137,9 +137,10 @@ stages:
targetPath: '$(Pipeline.Workspace)/${{parameters.ArtifactName}}-${{artifact.name}}-esrp-flattened'

pool:
name: azsdk-pool-mms-win-2022-general
image: azsdk-pool-mms-win-2022-1espt
name: azsdk-pool
image: windows-2022
os: windows

strategy:
runOnce:
deploy:
Expand All @@ -153,10 +154,10 @@ stages:
displayName: Publish Docs to GitHubIO Blob Storage
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
dependsOn: PublishESRPPackage

pool:
name: azsdk-pool-mms-win-2022-general
image: azsdk-pool-mms-win-2022-1espt
name: $(WINDOWSPOOL)
image: $(WINDOWSIMAGE)
os: windows

steps:
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/templates/variables/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
variables:
Pool: azsdk-pool-mms-ubuntu-2004-general
OSVmImage: azsdk-pool-mms-ubuntu-2004-1espt
DocWardenVersion: '0.4.2'
JavaBuildVersion: '1.11'
JavaTestVersion: '1.11'
Expand Down
24 changes: 4 additions & 20 deletions eng/pipelines/templates/variables/image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,11 @@

variables:
- name: LINUXPOOL
value: azsdk-pool-mms-ubuntu-2004-general
- name: LINUXNEXTPOOL
value: azsdk-pool-mms-ubuntu-2204-general
value: azsdk-pool
- name: WINDOWSPOOL
value: azsdk-pool-mms-win-2022-general
- name: MACPOOL
value: Azure Pipelines
value: azsdk-pool

- name: LINUXVMIMAGE
value: azsdk-pool-mms-ubuntu-2004-1espt
- name: LINUXNEXTVMIMAGE
value: azsdk-pool-mms-ubuntu-2204-1espt
value: ubuntu-24.04
- name: WINDOWSVMIMAGE
value: azsdk-pool-mms-win-2022-1espt
- name: MACVMIMAGE
value: macos-latest

# Values required for pool.os field in 1es pipeline templates
- name: LINUXOS
value: linux
- name: WINDOWSOS
value: windows
- name: MACOS
value: macOS
value: windows-2022