diff --git a/eng/pipelines/templates/jobs/run-cli-tests.yml b/eng/pipelines/templates/jobs/run-cli-tests.yml index c3de648896d4..376bb9bb0086 100644 --- a/eng/pipelines/templates/jobs/run-cli-tests.yml +++ b/eng/pipelines/templates/jobs/run-cli-tests.yml @@ -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: diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml index 95a0e157ff86..4c22e4ce5183 100644 --- a/eng/pipelines/templates/jobs/smoke.tests.yml +++ b/eng/pipelines/templates/jobs/smoke.tests.yml @@ -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): diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json index ee94f3bdeb9b..f7183c706bed 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json +++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json @@ -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" @@ -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" diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index b3aadb177ed0..340552e70001 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -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" } }, "PythonVersion": [ "pypy3.7", "3.7", "3.8" ], "CoverageArg": "--disablecov", diff --git a/eng/scripts/job-matrix/job-matrix-functions.filter.tests.ps1 b/eng/scripts/job-matrix/job-matrix-functions.filter.tests.ps1 index 52ab626166d0..8ca2c6c1d5b5 100644 --- a/eng/scripts/job-matrix/job-matrix-functions.filter.tests.ps1 +++ b/eng/scripts/job-matrix/job-matrix-functions.filter.tests.ps1 @@ -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" ] } diff --git a/eng/scripts/job-matrix/job-matrix-functions.tests.ps1 b/eng/scripts/job-matrix/job-matrix-functions.tests.ps1 index cc36fcd61680..8fd8fb7a66d8 100644 --- a/eng/scripts/job-matrix/job-matrix-functions.tests.ps1 +++ b/eng/scripts/job-matrix/job-matrix-functions.tests.ps1 @@ -12,7 +12,7 @@ BeforeAll { "operatingSystem": [ "windows-2019", "ubuntu-18.04", - "macOS-10.15" + "macos-11" ], "framework": [ "net461", @@ -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" } ] @@ -275,7 +275,7 @@ Describe "Platform Matrix Generation" -Tag "generate" { "operatingSystem": [ "windows-2019", "ubuntu-18.04", - "macOS-10.15" + "macos-11" ], "framework": [ "net461", @@ -359,7 +359,7 @@ 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" } @@ -367,7 +367,7 @@ Describe "Platform Matrix Generation" -Tag "generate" { 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 @@ -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" diff --git a/eng/scripts/job-matrix/samples/matrix.json b/eng/scripts/job-matrix/samples/matrix.json index 10d67730f0ec..03d4b7aa13aa 100644 --- a/eng/scripts/job-matrix/samples/matrix.json +++ b/eng/scripts/job-matrix/samples/matrix.json @@ -6,7 +6,7 @@ "operatingSystem": [ "windows-2019", "ubuntu-18.04", - "macOS-10.15" + "macos-11" ], "framework": [ "net461", diff --git a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json index da3f760ea4cb..b05817346d4b 100644 --- a/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json +++ b/sdk/communication/azure-communication-phonenumbers/phonenumbers-livetest-matrix.json @@ -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" diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json index 70f7f1c0f458..37758ccf8822 100644 --- a/sdk/storage/platform-matrix-all-versions.json +++ b/sdk/storage/platform-matrix-all-versions.json @@ -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",