Skip to content

Bump macOs version to macos-11 #25410

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
Sima Zhu (sima-zhu) merged 3 commits into from
Jul 28, 2022
Merged

Bump macOs version to macos-11 #25410

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
8afa709
Bump macOs version to macos-11
sima-zhu Jul 26, 2022
7fe9086
update the base platform matrix as well
scbedd Jul 27, 2022
ca500ea
Update eng/scripts/job-matrix/job-matrix-functions.tests.ps1
sima-zhu Jul 27, 2022
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/run-cli-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# imageName: 'windows-2019'
# poolName: 'azsdk-pool-mms-win-2019-general'
# mac:
# imageName: 'macOS-10.15'
# imageName: 'macos-11'
# poolName: 'Azure Pipelines'

pool:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/smoke.tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ jobs:
Python_37_Mac (AzureCloud):
PythonVersion: '3.7'
Pool: Azure Pipelines
OSVmImage: macOS-10.15
OSVmImage: macos-11
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
Python_38_Mac (AzureCloud):
PythonVersion: '3.8'
Pool: Azure Pipelines
OSVmImage: macOS-10.15
OSVmImage: macos-11
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ArmTemplateParameters: $(azureCloudArmParameters)
Python_38_Linux (AzureUSGovernment):
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"matrix": {
"Agent": {
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
},
"PythonVersion": [ "pypy3.7", "3.8"],
"CoverageArg": "--disablecov"
Expand All @@ -24,7 +24,7 @@
},
{
"Agent": {
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
},
"PythonVersion": "3.7",
"CoverageArg": "--disablecov"
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Agent": {
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
Comment thread
sima-zhu marked this conversation as resolved.
Outdated
},
"PythonVersion": [ "pypy3.7", "3.7", "3.8" ],
"CoverageArg": "--disablecov",
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/job-matrix/job-matrix-functions.filter.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BeforeAll {
$matrixConfig = @"
{
"matrix": {
"operatingSystem": [ "windows-2019", "ubuntu-18.04", "macOS-10.15" ],
"operatingSystem": [ "windows-2019", "ubuntu-18.04", "macos-11" ],
"framework": [ "net461", "netcoreapp2.1" ],
"additionalArguments": [ "", "mode=test" ]
}
Expand Down
14 changes: 7 additions & 7 deletions eng/scripts/job-matrix/job-matrix-functions.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BeforeAll {
"operatingSystem": [
"windows-2019",
"ubuntu-18.04",
"macOS-10.15"
"macos-11"
Comment thread
sima-zhu marked this conversation as resolved.
Outdated
],
"framework": [
"net461",
Expand All @@ -36,11 +36,11 @@ BeforeAll {
"framework": "net461"
},
{
"operatingSystem": "macOS-10.15",
"operatingSystem": "macos-11",
"framework": "netcoreapp2.1"
},
{
"operatingSystem": ["macOS-10.15", "ubuntu-18.04"],
"operatingSystem": ["macos-11", "ubuntu-18.04"],
"additionalArguments": "--enableFoo"
}
]
Expand Down Expand Up @@ -275,7 +275,7 @@ Describe "Platform Matrix Generation" -Tag "generate" {
"operatingSystem": [
"windows-2019",
"ubuntu-18.04",
"macOS-10.15"
"macos-11"
],
"framework": [
"net461",
Expand Down Expand Up @@ -359,15 +359,15 @@ Describe "Platform Matrix Generation" -Tag "generate" {
$element.parameters.additionalArguments | Should -Be "--enableFoo"

$element = GetNdMatrixElement @(2, 1, 1) $matrix $dimensions
$element.parameters.operatingSystem | Should -Be "macOS-10.15"
$element.parameters.operatingSystem | Should -Be "macos-11"
$element.parameters.framework | Should -Be "netcoreapp2.1"
$element.parameters.additionalArguments | Should -Be "--enableFoo"
}

It "Should initialize a sparse matrix from an N-dimensional matrix" -TestCases @(
@{ i = 0; name = "windows2019_net461"; operatingSystem = "windows-2019"; framework = "net461"; additionalArguments = ""; }
@{ i = 1; name = "ubuntu1804_netcoreapp21_withfoo"; operatingSystem = "ubuntu-18.04"; framework = "netcoreapp2.1"; additionalArguments = "--enableFoo"; }
@{ i = 2; name = "macOS1015_net461"; operatingSystem = "macOS-10.15"; framework = "net461"; additionalArguments = ""; }
@{ i = 2; name = "macOS11_net461"; operatingSystem = "macos-11"; framework = "net461"; additionalArguments = ""; }
) {
$sparseMatrix = GenerateSparseMatrix $generateConfig.orderedMatrix $generateConfig.displayNamesLookup
$dimensions = GetMatrixDimensions $generateConfig.orderedMatrix
Expand Down Expand Up @@ -465,7 +465,7 @@ Describe "Platform Matrix Post Transformation" -Tag "transform" {

$matrix[4].name | Should -Be "macOS1015_net461"
$matrix[4].parameters.framework | Should -Be "net461"
$matrix[4].parameters.operatingSystem | Should -Be "macOS-10.15"
$matrix[4].parameters.operatingSystem | Should -Be "macos-11"
$matrix[4].parameters.additionalArguments | Should -Be ""

$matrix[7].name | Should -Be "windows2019_net50_enableWindowsFoo"
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/job-matrix/samples/matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"operatingSystem": [
"windows-2019",
"ubuntu-18.04",
"macOS-10.15"
"macos-11"
],
"framework": [
"net461",
Expand Down
4 changes: 2 additions & 2 deletions sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"AZURE_TEST_AGENT": "WINDOWS_2019_PYTHON36",
"COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false"
},
"macOS-10.15": {
"OSVmImage": "macOS-10.15",
"macos-11": {
"OSVmImage": "macos-11",
"Pool": "Azure Pipelines",
"AZURE_TEST_AGENT": "MACOS_1015_PYTHON37",
"COMMUNICATION_SKIP_CAPABILITIES_LIVE_TEST": "false"
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/platform-matrix-all-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Agent": {
"ubuntu-18.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
"windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
"macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
},
"PythonVersion": [ "pypy3.7", "3.7", "3.8", "3.9" ],
"CoverageArg": "--disablecov",
Expand Down