From e10217f69334e31a91f7070e699ce27b0f04e881 Mon Sep 17 00:00:00 2001
From: gargsaumya <saumyagarg.100@gmail.com>
Date: Fri, 13 Feb 2026 09:38:54 +0530
Subject: [PATCH] Update OneBranch pipelines for new 1ES images
 (Windows/Linux/macOS)

---
 .../build-release-package-pipeline.yml        |  4 ++--
 OneBranchPipelines/dummy-release-pipeline.yml |  4 ++--
 .../official-release-pipeline.yml             |  4 ++--
 .../stages/build-linux-single-stage.yml       | 23 ++++++++++---------
 .../stages/build-windows-single-stage.yml     |  4 ++--
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/OneBranchPipelines/build-release-package-pipeline.yml b/OneBranchPipelines/build-release-package-pipeline.yml
index 550d317df..2c0c64cee 100644
--- a/OneBranchPipelines/build-release-package-pipeline.yml
+++ b/OneBranchPipelines/build-release-package-pipeline.yml
@@ -201,8 +201,8 @@ extends:
   parameters:
     # Pool Configuration
     # Different platforms use different agent pools:
-    # - Windows: Custom 1ES pool (Django-1ES-pool) with WIN22-SQL22 image (Windows Server 2022 + SQL Server 2022)
-    # - Linux: Custom 1ES pool (Django-1ES-pool) with ADO-UB22-SQL22 image (Ubuntu 22.04 + SQL Server 2022)
+    # - Windows: Custom 1ES pool (Python-1ES-pool) with PYTHON-1ES-MMS2022 image (Windows Server 2022 + SQL Server 2022)
+    # - Linux: Custom 1ES pool (Python-1ES-pool) with PYTHON-1ES-UB2404 image (Ubuntu 24.04 + SQL Server 2022)
     # - macOS: Microsoft-hosted pool (Azure Pipelines) with macOS-14 image (macOS Sonoma)
     # Note: Container definitions section present but unused (pools configured in individual stage templates)
     
diff --git a/OneBranchPipelines/dummy-release-pipeline.yml b/OneBranchPipelines/dummy-release-pipeline.yml
index 7d3186639..9c8637f65 100644
--- a/OneBranchPipelines/dummy-release-pipeline.yml
+++ b/OneBranchPipelines/dummy-release-pipeline.yml
@@ -96,9 +96,9 @@ extends:
             pool:
               type: windows
               isCustom: true
-              name: Django-1ES-pool
+              name: Python-1ES-pool
               demands:
-              - imageOverride -equals WIN22-SQL22
+              - imageOverride -equals PYTHON-1ES-MMS2022
             
             variables:
               ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
diff --git a/OneBranchPipelines/official-release-pipeline.yml b/OneBranchPipelines/official-release-pipeline.yml
index 9a979d2d5..822a727a0 100644
--- a/OneBranchPipelines/official-release-pipeline.yml
+++ b/OneBranchPipelines/official-release-pipeline.yml
@@ -99,9 +99,9 @@ extends:
             pool:
               type: windows
               isCustom: true
-              name: Django-1ES-pool
+              name: Python-1ES-pool
               demands:
-              - imageOverride -equals WIN22-SQL22
+              - imageOverride -equals PYTHON-1ES-MMS2022
             
             variables:
               ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
diff --git a/OneBranchPipelines/stages/build-linux-single-stage.yml b/OneBranchPipelines/stages/build-linux-single-stage.yml
index 6b68a737b..99dbbd461 100644
--- a/OneBranchPipelines/stages/build-linux-single-stage.yml
+++ b/OneBranchPipelines/stages/build-linux-single-stage.yml
@@ -35,9 +35,9 @@ stages:
         pool:
           type: linux
           isCustom: true
-          name: Django-1ES-pool
+          name: Python-1ES-pool
           demands:
-          - imageOverride -equals ADO-UB22-SQL22
+          - imageOverride -equals PYTHON-1ES-UB2404
         # Extended timeout for multi-version builds + testing (5 Python versions × build + test time)
         timeoutInMinutes: 120
         
@@ -65,12 +65,8 @@ stages:
           - checkout: self
             fetchDepth: 0
           
-          # Install Docker
-          - task: DockerInstaller@0
-            inputs:
-              dockerVersion: '20.10.21'
-            displayName: 'Install Docker'
-          
+          # Docker is pre-installed now
+          # Verify it's working and start the daemon
           - bash: |
               set -e
               echo "Verifying we're on Linux..."
@@ -82,9 +78,14 @@ stages:
               
               uname -a
               
-              # Start dockerd
-              sudo dockerd > docker.log 2>&1 &
-              sleep 10
+              # Check if Docker daemon is already running
+              if ! docker info > /dev/null 2>&1; then
+                echo "Docker daemon not running, starting it..."
+                sudo dockerd > docker.log 2>&1 &
+                sleep 10
+              else
+                echo "Docker daemon already running"
+              fi
               
               # Verify Docker works
               docker --version
diff --git a/OneBranchPipelines/stages/build-windows-single-stage.yml b/OneBranchPipelines/stages/build-windows-single-stage.yml
index fc869f35e..3523267ca 100644
--- a/OneBranchPipelines/stages/build-windows-single-stage.yml
+++ b/OneBranchPipelines/stages/build-windows-single-stage.yml
@@ -38,9 +38,9 @@ stages:
         pool:
           type: windows
           isCustom: true
-          name: Django-1ES-pool
+          name: Python-1ES-pool
           demands:
-          - imageOverride -equals WIN22-SQL22
+          - imageOverride -equals PYTHON-1ES-MMS2022
         # Extended timeout for downloads, builds, and testing
         timeoutInMinutes: 120