Skip to content
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

Update macos image from 11 to latest #44607

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Update macos image from 11 to latest #44607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50800b9
Update macos image from 11 to latest
weshaggard Jun 17, 2024
7a597da
Update eng/pipelines/templates/jobs/ci.mgmt.yml
weshaggard Jun 17, 2024
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: 1 addition & 1 deletion eng/pipelines/templates/jobs/ci.mgmt.yml
View file
Open in desktop
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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ArthurMa1978 @live1206 is this pipeline needed any longer? It has been failing for at least a month.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is still needed for sdk-for-net PR CI. I think it worked last week here, got ignored quite recently.
Thanks for the update to make it work again!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see a passing build since the beginning of May https://dev.azure.com/azure-sdk/public/_build?definitionId=529&_a=summary

Copy link
Member

@live1206 live1206 Jun 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I just realized this is for Track 1 mgmt SDK, then this is not needed anymore. @ArthurMa1978 is planning to remove the code base of Track 1 mgmt SDKs.
And it started to fail because there are some moderate severity vulnerability dependent packages.

pool:
name: $(Pool)
vmImage: $(OSVmImage)
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json
View file
Open in desktop
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
Loading