Skip to content

Upgrade pools #9009

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
timotheeguerin merged 3 commits into from
Dec 5, 2025
Merged

Upgrade pools #9009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfbdd48
upgrade pools
timotheeguerin Nov 14, 2025
1b9753c
abc
timotheeguerin Nov 14, 2025
4b09a6b
Merge branch 'main' into upgrade/pool-images
timotheeguerin Nov 26, 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
2 changes: 0 additions & 2 deletions cspell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ words:
- lropaging
- lstrip
- lzutf
- MACVMIMAGE
- MACVMIMAGEM
- mday
- methodsubscriptionid
- mgmt
Expand Down
10 changes: 5 additions & 5 deletions eng/common/pipelines/templates/variables/image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ variables:
- name: LINUXNEXTVMIMAGE
value: ubuntu-24.04
- name: LINUXARMVMIMAGE
value: azsdk-pool-mms-mariner-2-arm-1espt
value: azure-linux-3-arm64
- name: WINDOWSVMIMAGE
value: windows-2022
- name: WINDOWSARMVMIMAGE
value: windows-2022-arm64-1espt
- name: MACVMIMAGE # mac - arm64
value: macos-latest
- name: MACVMIMAGE13 # mac - x64
value: macos-13
- name: MAC_ARM_VM_IMAGE # mac - arm64
value: macos-latest-internal
- name: MAC_X64_VM_IMAGE # mac - x64
value: macos-15

# Values required for pool.os field in 1es pipeline templates. Variable form
# cannot be used, instead those values must be written directly into pool.os.
Expand Down
4 changes: 2 additions & 2 deletions eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
hostArchitecture: arm64
${{ if eq(parameters.platform, 'macos-x64') }}:
name: $(MACPOOL)
vmImage: $(MACVMIMAGE13)
vmImage: $(MAC_X64_VM_IMAGE)
os: macOS
${{ if eq(parameters.platform, 'macos-arm64') }}:
name: $(MACPOOL)
vmImage: $(MACVMIMAGE)
vmImage: $(MAC_ARM_VM_IMAGE)
os: macOS
${{ if eq(parameters.platform, 'windows-x64') }}:
name: $(WINDOWSPOOL)
Expand Down
4 changes: 2 additions & 2 deletions eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
hostArchitecture: arm64
${{ if eq(parameters.platform, 'macos-x64') }}:
name: $(MACPOOL)
vmImage: $(MACVMIMAGE13)
vmImage: $(MAC_X64_VM_IMAGE)
os: macOS
${{ if eq(parameters.platform, 'macos-arm64') }}:
name: $(MACPOOL)
vmImage: $(MACVMIMAGE)
vmImage: $(MAC_ARM_VM_IMAGE)
os: macOS
${{ if eq(parameters.platform, 'windows-x64') }}:
name: $(WINDOWSPOOL)
Expand Down
1 change: 1 addition & 0 deletions eng/tsp-core/pipelines/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ trigger:
- main
# For patch releases
- release/*
- upgrade/pool-images
paths:
exclude:
- packages/http-client-csharp
Expand Down
Loading