Where applicable, update Windows pools used to `azsdk-pool-mms-win-20…

…22-general` and rename `vmImage` to the `windows-20xx` format (#2504)
Azure · Feb 17, 2023 · 437038d · 437038d
1 parent 86bd534
commit 437038d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -85,7 +85,7 @@ jobs:
 
       Windows_VS2022_X86_Release_MapFiles_UnitTests:
         Pool: azsdk-pool-mms-win-2022-general
-        OSVmImage: MMS2022
+        OSVmImage: windows-2022
         vcpkg.deps: 'cmocka'
         VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
         build.args: '-DPRECONDITIONS=OFF -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
@@ -183,7 +183,7 @@ jobs:
 
       Windows2019_Preconditions_UnitTests_Samples:
         Pool: azsdk-pool-mms-win-2019-general
-        OSVmImage: MMS2019
+        OSVmImage: windows-2019
         vcpkg.deps: 'curl[winssl] paho-mqtt cmocka'
         VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=WIN32 -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
@@ -194,15 +194,15 @@ jobs:
 
       Windows2022_Preconditions_UnitTests_Samples:
         Pool: azsdk-pool-mms-win-2022-general
-        OSVmImage: MMS2022
+        OSVmImage: windows-2022
         vcpkg.deps: 'curl[winssl] paho-mqtt cmocka'
         VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=WIN32 -DUNIT_TESTING=ON -DLOGGING=OFF -DADDRESS_SANITIZER=ON'
         CMAKE_GENERATOR: 'Visual Studio 17 2022'
         CMAKE_GENERATOR_PLATFORM: x64
         PublishMapFiles: 'false'
         BuildType: Debug
- 
+
       MacOS_Release_Preconditions_Logging_UnitTests_Samples:
         Pool: Azure Pipelines
         OSVmImage: 'macos-11'
@@ -247,7 +247,7 @@ jobs:
 
       Windows_Release_Samples_MapFiles:
         Pool: azsdk-pool-mms-win-2022-general
-        OSVmImage: MMS2022
+        OSVmImage: windows-2022
         vcpkg.deps: 'paho-mqtt'
         VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         build.args: '-DPRECONDITIONS=OFF -DLOGGING=OFF -DTRANSPORT_PAHO=ON'
@@ -454,7 +454,7 @@ jobs:
 - job: GenerateReleaseArtifacts
   pool:
     name: azsdk-pool-mms-win-2022-general
-    vmImage: MMS2022
+    vmImage: windows-2022
   variables:
     Package.EnableSBOMSigning: true
   steps:

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -24,7 +24,7 @@ jobs:
         # Test on the win 2019
         Win2019_x64_with_iot_samples:
           Pool: azsdk-pool-mms-win-2019-general
-          OSVmImage: MMS2019
+          OSVmImage: windows-2019
           VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
           CMAKE_GENERATOR: 'Visual Studio 16 2019'
           CMAKE_GENERATOR_PLATFORM: x64
@@ -34,7 +34,7 @@ jobs:
         # Test on the win 2022
         Win2022_x64_with_iot_samples:
           Pool: azsdk-pool-mms-win-2022-general
-          OSVmImage: MMS2022
+          OSVmImage: windows-2022
           VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
           CMAKE_GENERATOR: 'Visual Studio 17 2022'
           CMAKE_GENERATOR_PLATFORM: x64
@@ -57,14 +57,14 @@ jobs:
         #   build.args: ' -DTRANSPO.RT_CURL=ON -DAZ_PLATFORM_IMPL=POSIX'
         # Win_x86_with_sampldes:
         #   Pool: azsdk-pool-mms-win-2022-general
-        #   OSVmImage: MMS2022
+        #   OSVmImage: windows-2022
         #   VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
         #   CMAKE_GENERATOR: 'Visual Studio 17 2022'
         #   CMAKE_GENERATOR_PLATFORM: Win32
         #   build.args: ' -DTRANSPORT_CURL=ON -DAZ_PLATFORM_IMPL=WIN32'
         # Win_x64_with_samples:
         #   Pool: azsdk-pool-mms-win-2022-general
-        #   OSVmImage: MMS2022
+        #   OSVmImage: windows-2022
         #   VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         #   CMAKE_GENERATOR: 'Visual Studio 17 2022'
         #   CMAKE_GENERATOR_PLATFORM: x64

diff --git a/eng/pipelines/templates/stages/archetype-c-release.yml b/eng/pipelines/templates/stages/archetype-c-release.yml
@@ -12,7 +12,7 @@ stages:
 
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         strategy:
           runOnce:
@@ -37,15 +37,15 @@ stages:
                     RepoId: $(Build.Repository.Name)
                     WorkingDirectory: $(Build.SourcesDirectory)
                     ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts/
-                
+
       - deployment: PublishDocs
         displayName: Publish Docs to GitHub pages
         condition: ne(variables['Skip.PublishDocs'], 'true')
         environment: githubio
 
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         strategy:
           runOnce:
@@ -71,7 +71,7 @@ stages:
 
         pool:
           name: azsdk-pool-mms-win-2022-general
-          vmImage: MMS2022
+          vmImage: windows-2022
 
         strategy:
           runOnce: