From 66f51aa446b97864e7af6966054b580e86fa8afb Mon Sep 17 00:00:00 2001 From: Jocelyn Schreppler Date: Tue, 16 Jul 2024 11:16:30 -0400 Subject: [PATCH] Revert "Update macos image from 11 to latest (#44607)" this is causing too many problems. skipping macos tests for now. They'll run when this feature branch merges into main. This reverts commit 29e87b496fa2b60d53849afaa926a3bd0fc23529. --- eng/pipelines/templates/jobs/ci.mgmt.yml | 2 +- .../stages/archetype-sdk-tool-pwsh.yml | 2 +- .../templates/stages/platform-matrix.json | 12 ++++----- eng/pipelines/templates/variables/image.yml | 27 ------------------- .../expect-matrix-integration.json | 8 +++--- .../tests/inputs/sync-platform-matrix.json | 8 +++--- .../phone-numbers-livetest-matrix.json | 8 +++--- 7 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 eng/pipelines/templates/variables/image.yml diff --git a/eng/pipelines/templates/jobs/ci.mgmt.yml b/eng/pipelines/templates/jobs/ci.mgmt.yml index 89e99c21f7436..e2d22e2d2fc85 100644 --- a/eng/pipelines/templates/jobs/ci.mgmt.yml +++ b/eng/pipelines/templates/jobs/ci.mgmt.yml @@ -68,7 +68,7 @@ jobs: OSVmImage: windows-2022 MacOs: Pool: Azure Pipelines - OSVmImage: "macos-latest" + OSVmImage: "macos-11" pool: name: $(Pool) vmImage: $(OSVmImage) diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml index 767ffdd16773f..4295ed239e858 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml @@ -29,7 +29,7 @@ stages: Image: 'MMSUbuntu20.04' Mac: Pool: 'Azure Pipelines' - Image: 'macos-latest' + Image: 'macos-11' pool: name: $(Pool) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 87798fc25eb8c..93ae5d5c07173 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -25,14 +25,14 @@ "Pool": "azsdk-pool-mms-win-2022-general", "TestTargetFramework": "net7.0" }, - "MacOS_NET6.0": { - "OSVmImage": "env:MACVMIMAGE", - "Pool": "env:MACPOOL", + "MacOS-11_NET6.0": { + "OSVmImage": "macos-11", + "Pool": "Azure Pipelines", "TestTargetFramework": "net6.0" }, - "MacOS_NET7.0": { - "OSVmImage": "env:MACVMIMAGE", - "Pool": "env:MACPOOL", + "MacOS-11_NET7.0": { + "OSVmImage": "macos-11", + "Pool": "Azure Pipelines", "TestTargetFramework": "net7.0" } }, diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml deleted file mode 100644 index ba4e91639a821..0000000000000 --- a/eng/pipelines/templates/variables/image.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Default pool image selection. Set as variable so we can override at pipeline level - -variables: - - name: LINUXPOOL - value: azsdk-pool-mms-ubuntu-2004-general - - name: WINDOWSPOOL - value: azsdk-pool-mms-win-2022-general - - name: MACPOOL - value: Azure Pipelines - - - name: LINUXVMIMAGE - value: azsdk-pool-mms-ubuntu-2004-1espt - - name: LINUXNEXTVMIMAGE - value: ubuntu-22.04 - - name: WINDOWSVMIMAGE - value: azsdk-pool-mms-win-2022-1espt - - name: MACVMIMAGE - value: macos-latest - - # Values required for pool.os field in 1es pipeline templates - - name: LINUXOS - value: linux - - name: WINDOWSOS - value: windows - - name: MACOS - value: macOS - diff --git a/eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json b/eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json index 02f2808bfe270..d2132266faaf0 100644 --- a/eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json +++ b/eng/scripts/splittestdependencies/tests/expectOutputs/expect-matrix-integration.json @@ -25,13 +25,13 @@ "Pool": "azsdk-pool-mms-win-2022-general", "TestTargetFramework": "net462" }, - "macos_NETCore3.1": { - "OSVmImage": "macos-latest", + "macos-11_NETCore3.1": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "netcoreapp3.1" }, - "macos_NET6.0": { - "OSVmImage": "macos-latest", + "macos-11_NET6.0": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "net6.0" } diff --git a/eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json b/eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json index 555a8e0112c4e..72725495ddf63 100644 --- a/eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json +++ b/eng/scripts/splittestdependencies/tests/inputs/sync-platform-matrix.json @@ -25,13 +25,13 @@ "Pool": "azsdk-pool-mms-win-2022-general", "TestTargetFramework": "net462" }, - "macos_NETCore3.1": { - "OSVmImage": "macos-latest", + "macos-11_NETCore3.1": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "netcoreapp3.1" }, - "macos_NET6.0": { - "OSVmImage": "macos-latest", + "macos-11_NET6.0": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "net6.0" } diff --git a/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json b/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json index da1e240e9139f..2d3ba82c59731 100644 --- a/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json +++ b/sdk/communication/Azure.Communication.PhoneNumbers/phone-numbers-livetest-matrix.json @@ -36,15 +36,15 @@ "SKIP_SIPROUTING_LIVE_TESTS": "TRUE" }, - "macos_NET7.0": { - "OSVmImage": "macos-latest", + "macos-11_NET7.0": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "net7.0", "SKIP_UPDATE_CAPABILITIES_LIVE_TESTS": "TRUE", "SKIP_SIPROUTING_LIVE_TESTS": "TRUE" }, - "macos_NET6.0": { - "OSVmImage": "macos-latest", + "macos-11_NET6.0": { + "OSVmImage": "macos-11", "Pool": "Azure Pipelines", "TestTargetFramework": "net6.0", "AZURE_TEST_AGENT": "MACOS_1015_NET60",