diff --git a/cspell.yaml b/cspell.yaml index 3d5a5009cdb..98e7cc43a05 100644 --- a/cspell.yaml +++ b/cspell.yaml @@ -142,8 +142,6 @@ words: - lropaging - lstrip - lzutf - - MACVMIMAGE - - MACVMIMAGEM - mday - methodsubscriptionid - mgmt diff --git a/eng/common/pipelines/templates/variables/image.yml b/eng/common/pipelines/templates/variables/image.yml index 8c0b780abc1..87d9439f813 100644 --- a/eng/common/pipelines/templates/variables/image.yml +++ b/eng/common/pipelines/templates/variables/image.yml @@ -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. diff --git a/eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml b/eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml index 41e79000ca7..da0d39ebed9 100644 --- a/eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml +++ b/eng/tsp-core/pipelines/jobs/cli/build-tsp-cli.yml @@ -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) diff --git a/eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml b/eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml index 566ede09b30..8551b416fd2 100644 --- a/eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml +++ b/eng/tsp-core/pipelines/jobs/cli/verify-tsp-cli.yml @@ -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) diff --git a/eng/tsp-core/pipelines/publish.yml b/eng/tsp-core/pipelines/publish.yml index ab6e626181d..b2d43f64177 100644 --- a/eng/tsp-core/pipelines/publish.yml +++ b/eng/tsp-core/pipelines/publish.yml @@ -6,6 +6,7 @@ trigger: - main # For patch releases - release/* + - upgrade/pool-images paths: exclude: - packages/http-client-csharp