Update macos image from 11 to latest (#44607)

* Update macos image from 11 to latest * Update eng/pipelines/templates/jobs/ci.mgmt.yml Co-authored-by: Ben Broderick Phillips <ben@benbp.net> --------- Co-authored-by: Ben Broderick Phillips <ben@benbp.net>
Azure · Jul 16, 2024 · 29e87b4 · 29e87b4
1 parent f17d7dd
commit 29e87b4
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 20 deletions.
diff --git 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-11"
+          OSVmImage: "macos-latest"
     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
@@ -29,7 +29,7 @@ stages:
               Image: 'MMSUbuntu20.04'
             Mac:
               Pool: 'Azure Pipelines'
-              Image: 'macos-11'
+              Image: 'macos-latest'
 
         pool:
           name: $(Pool)

diff --git 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-11_NET6.0": {
-        "OSVmImage": "macos-11",
-        "Pool": "Azure Pipelines",
+      "MacOS_NET6.0": {
+        "OSVmImage": "env:MACVMIMAGE",
+        "Pool": "env:MACPOOL",
         "TestTargetFramework": "net6.0"
       },
-      "MacOS-11_NET7.0": {
-        "OSVmImage": "macos-11",
-        "Pool": "Azure Pipelines",
+      "MacOS_NET7.0": {
+        "OSVmImage": "env:MACVMIMAGE",
+        "Pool": "env:MACPOOL",
         "TestTargetFramework": "net7.0"
       }
     },

diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml
@@ -0,0 +1,27 @@
+# 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
@@ -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"
       }

diff --git 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-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"
       }

diff --git 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-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",