Skip to content

Commit

Permalink
Update macos image from 11 to latest (Azure#44607)
Browse files Browse the repository at this point in the history
* Update macos image from 11 to latest

* Update eng/pipelines/templates/jobs/ci.mgmt.yml

Co-authored-by: Ben Broderick Phillips <[email protected]>

---------

Co-authored-by: Ben Broderick Phillips <[email protected]>
  • Loading branch information
2 people authored and christothes committed Sep 26, 2024
1 parent bb996ad commit 0c5a660
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/ci.mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
OSVmImage: windows-2022
MacOs:
Pool: Azure Pipelines
OSVmImage: "macos-11"
OSVmImage: "macos-latest"
pool:
name: $(Pool)
vmImage: $(OSVmImage)
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stages:
Image: 'MMSUbuntu20.04'
Mac:
Pool: 'Azure Pipelines'
Image: 'macos-11'
Image: 'macos-latest'

pool:
name: $(Pool)
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"Pool": "env:WINDOWSPOOL",
"TestTargetFramework": "net7.0"
},
"MacOS-11_NET6.0": {
"MacOS_NET6.0": {
"OSVmImage": "env:MACVMIMAGE",
"Pool": "env:MACPOOL",
"TestTargetFramework": "net6.0"
},
"MacOS-11_NET7.0": {
"MacOS_NET7.0": {
"OSVmImage": "env:MACVMIMAGE",
"Pool": "env:MACPOOL",
"TestTargetFramework": "net7.0"
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/variables/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variables:
- name: WINDOWSVMIMAGE
value: azsdk-pool-mms-win-2022-1espt
- name: MACVMIMAGE
value: macos-11
value: macos-latest

# Values required for pool.os field in 1es pipeline templates
- name: LINUXOS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net462"
},
"macos-11_NETCore3.1": {
"OSVmImage": "macos-11",
"macos_NETCore3.1": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "netcoreapp3.1"
},
"macos-11_NET6.0": {
"OSVmImage": "macos-11",
"macos_NET6.0": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "net6.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"Pool": "azsdk-pool-mms-win-2022-general",
"TestTargetFramework": "net462"
},
"macos-11_NETCore3.1": {
"OSVmImage": "macos-11",
"macos_NETCore3.1": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "netcoreapp3.1"
},
"macos-11_NET6.0": {
"OSVmImage": "macos-11",
"macos_NET6.0": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "net6.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
"SKIP_SIPROUTING_LIVE_TESTS": "TRUE"
},

"macos-11_NET7.0": {
"OSVmImage": "macos-11",
"macos_NET7.0": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "net7.0",
"SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE",
"SKIP_SIPROUTING_LIVE_TESTS": "TRUE"
},
"macos-11_NET6.0": {
"OSVmImage": "macos-11",
"macos_NET6.0": {
"OSVmImage": "macos-latest",
"Pool": "Azure Pipelines",
"TestTargetFramework": "net6.0",
"AZURE_TEST_AGENT": "MACOS_1015_NET60",
Expand Down

0 comments on commit 0c5a660

Please sign in to comment.