Skip to content

Commit e50ab7c

Browse files
Upgrade pools (#9009)
1 parent e235fbd commit e50ab7c

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

cspell.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ words:
142142
- lropaging
143143
- lstrip
144144
- lzutf
145-
- MACVMIMAGE
146-
- MACVMIMAGEM
147145
- mday
148146
- methodsubscriptionid
149147
- mgmt

eng/common/pipelines/templates/variables/image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ variables:
1717
- name: LINUXNEXTVMIMAGE
1818
value: ubuntu-24.04
1919
- name: LINUXARMVMIMAGE
20-
value: azsdk-pool-mms-mariner-2-arm-1espt
20+
value: azure-linux-3-arm64
2121
- name: WINDOWSVMIMAGE
2222
value: windows-2022
2323
- name: WINDOWSARMVMIMAGE
2424
value: windows-2022-arm64-1espt
25-
- name: MACVMIMAGE # mac - arm64
26-
value: macos-latest
27-
- name: MACVMIMAGE13 # mac - x64
28-
value: macos-13
25+
- name: MAC_ARM_VM_IMAGE # mac - arm64
26+
value: macos-latest-internal
27+
- name: MAC_X64_VM_IMAGE # mac - x64
28+
value: macos-15
2929

3030
# Values required for pool.os field in 1es pipeline templates. Variable form
3131
# cannot be used, instead those values must be written directly into pool.os.

eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
hostArchitecture: arm64
1818
${{ if eq(parameters.platform, 'macos-x64') }}:
1919
name: $(MACPOOL)
20-
vmImage: $(MACVMIMAGE13)
20+
vmImage: $(MAC_X64_VM_IMAGE)
2121
os: macOS
2222
${{ if eq(parameters.platform, 'macos-arm64') }}:
2323
name: $(MACPOOL)
24-
vmImage: $(MACVMIMAGE)
24+
vmImage: $(MAC_ARM_VM_IMAGE)
2525
os: macOS
2626
${{ if eq(parameters.platform, 'windows-x64') }}:
2727
name: $(WINDOWSPOOL)

eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
hostArchitecture: arm64
2424
${{ if eq(parameters.platform, 'macos-x64') }}:
2525
name: $(MACPOOL)
26-
vmImage: $(MACVMIMAGE13)
26+
vmImage: $(MAC_X64_VM_IMAGE)
2727
os: macOS
2828
${{ if eq(parameters.platform, 'macos-arm64') }}:
2929
name: $(MACPOOL)
30-
vmImage: $(MACVMIMAGE)
30+
vmImage: $(MAC_ARM_VM_IMAGE)
3131
os: macOS
3232
${{ if eq(parameters.platform, 'windows-x64') }}:
3333
name: $(WINDOWSPOOL)

eng/tsp-core/pipelines/publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ trigger:
66
- main
77
# For patch releases
88
- release/*
9+
- upgrade/pool-images
910
paths:
1011
exclude:
1112
- packages/http-client-csharp

0 commit comments

Comments
 (0)