From ef5c3cfc45e4158ab14441d75eda8b0713b4f590 Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Thu, 5 Jun 2025 14:17:35 -0700
Subject: [PATCH] Migrate to azsdk-pool, Move off Windows 2019 (#6609)

---
 eng/pipelines/daily-verification.yml             |  9 +++++++--
 .../templates/stages/archetype-cpp-release.yml   |  4 ++--
 .../templates/stages/archetype-sdk-client.yml    |  4 ++--
 .../templates/stages/platform-matrix-live.json   |  5 -----
 .../templates/stages/platform-matrix.json        |  7 +++----
 eng/pipelines/templates/variables/image.yml      | 16 ++++++++--------
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/eng/pipelines/daily-verification.yml b/eng/pipelines/daily-verification.yml
index b5889c01b..daa7d3e69 100644
--- a/eng/pipelines/daily-verification.yml
+++ b/eng/pipelines/daily-verification.yml
@@ -3,12 +3,17 @@ jobs:
   - job:
     displayName: Daily vcpkg PR
     pool:
-      name: azsdk-pool-mms-win-2022-general
+      name: $(WINDOWSPOOL)
+      demands: $(WindowsImageDemand)
 
     variables:
       # The branch in the azure-sdk/vcpkg repo that is updated daily with the
       # latest set of ports
-      TargetPrBranch: release/azure-sdk-for-cpp-daily-verification
+      - name: TargetPrBranch
+        value: release/azure-sdk-for-cpp-daily-verification
+
+      - template: /eng/pipelines/templates/variables/image.yml
+
 
     steps:
       - checkout: self
diff --git a/eng/pipelines/templates/stages/archetype-cpp-release.yml b/eng/pipelines/templates/stages/archetype-cpp-release.yml
index f24e823e9..7c2b339a3 100644
--- a/eng/pipelines/templates/stages/archetype-cpp-release.yml
+++ b/eng/pipelines/templates/stages/archetype-cpp-release.yml
@@ -25,8 +25,8 @@ stages:
             environment: package-publish
 
             pool:
-              name: azsdk-pool-mms-win-2022-general
-              image: azsdk-pool-mms-win-2022-1espt
+              name: azsdk-pool
+              image: windows-2022
               os: windows
 
             templateContext:
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 6c81aac98..ab5542b48 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -97,8 +97,8 @@ extends:
           isMainPipeline: true
           enableForGitHub: true
       sourceAnalysisPool:
-        name: azsdk-pool-mms-win-2022-general
-        image: azsdk-pool-mms-win-2022-1espt
+        name: azsdk-pool
+        image: windows-2022
         os: windows
       # Turn off the build warnings caused by disabling some sdl checks
       createAdoIssuesForJustificationsForDisablement: false
diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json
index 8d3c5cac4..671d90284 100644
--- a/eng/pipelines/templates/stages/platform-matrix-live.json
+++ b/eng/pipelines/templates/stages/platform-matrix-live.json
@@ -52,11 +52,6 @@
     },
     {
       "StaticConfigs": {
-        "Win2019": {
-          "Pool": "env:WINDOWSPREVIOUSPOOL",
-          "OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
-          "CMAKE_GENERATOR": "Visual Studio 16 2019"
-        },
         "Win2022": {
           "Pool": "env:WINDOWSPOOL",
           "OSVmImage": "env:WINDOWSVMIMAGE",
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index b0326ea35..0c14454e2 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -30,10 +30,9 @@
     },
     {
       "StaticConfigs": {
-        "Win2019_x64_Release": {
-          "OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2019-1es-pt",
-          "CMAKE_GENERATOR": "Visual Studio 16 2019",
+        "Win2022_x64_Release": {
+          "OSVmImage": "env:WINDOWSVMIMAGE",
+          "Pool": "env:WINDOWSPOOL",
           "CMAKE_GENERATOR_PLATFORM": "x64",
           "VCPKG_DEFAULT_TRIPLET": "x64-windows-static",
           "BuildArgs": "--parallel 8 --config Release"
diff --git a/eng/pipelines/templates/variables/image.yml b/eng/pipelines/templates/variables/image.yml
index ed2532f59..b76d049b4 100644
--- a/eng/pipelines/templates/variables/image.yml
+++ b/eng/pipelines/templates/variables/image.yml
@@ -2,20 +2,16 @@
 
 variables:
   - name: LINUXPOOL
-    value: azsdk-pool-mms-ubuntu-2204-general
+    value: azsdk-pool
   - name: WINDOWSPOOL
-    value: azsdk-pool-mms-win-2022-general
-  - name: WINDOWSPREVIOUSPOOL
-    value: azsdk-pool-mms-win-2019-general
+    value: azsdk-pool
   - name: MACPOOL
     value: Azure Pipelines
 
   - name: LINUXVMIMAGE
-    value: azsdk-pool-mms-ubuntu-2204-1espt
+    value: ubuntu-22.04
   - name: WINDOWSVMIMAGE
-    value: azsdk-pool-mms-win-2022-1espt
-  - name: WINDOWSPREVIOUSVMIMAGE
-    value: azsdk-pool-mms-win-2019-1espt
+    value: windows-2022
   - name: MACVMIMAGE
     value: macos-latest
 
@@ -27,3 +23,7 @@ variables:
   - name: MACOS
     value: macOS
 
+  - name: LinuxImageDemand
+    value: ImageOverride -equals $(LINUXVMIMAGE)
+  - name: WindowsImageDemand
+    value: ImageOverride -equals $(WINDOWSVMIMAGE)
\ No newline at end of file