From ca0c90649c4e4a497378b135c1bd1b99db4e6226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Fri, 23 Jan 2026 16:21:42 +0100
Subject: [PATCH 1/3] chore(windows): build from Windows 2025 agents by default

---
 Jenkinsfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3027f5626..c1b1c2534 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,13 +14,8 @@ def agentSelector(String imageType, retryCounter) {
             platform = 'windows-2019'
             break
 
-        // nanoserver-ltsc2022 and windowservercore-ltsc2022
-        case ~/.*2022/:
-            platform = 'windows-2022'
-            break
-
-        // nanoserver-ltsc2025 and windowservercore-ltsc2025
-        case ~/.*2025/:
+        // All other Windows images
+        case ~/(nanoserver|windowsservercore).*/:
             platform = 'windows-2025'
             break
 

From 2cf6b4fef346361ddf59fb10b65522c86a614a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Thu, 29 Jan 2026 10:37:26 +0100
Subject: [PATCH 2/3] test: remove docker daemon config

---
 Jenkinsfile |  6 ++++--
 build.ps1   | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c1b1c2534..f6bd3dc50 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,9 +55,11 @@ def parallelStages = [failFast: false]
                 node(resolvedAgentLabel) {
                     timeout(time: 60, unit: 'MINUTES') {
                         checkout scm
-                        if (imageType == "linux") {
-                            stage('Prepare Docker') {
+                        stage('Prepare Docker') {
+                            if (isUnix()) {
                                 sh 'make docker-init'
+                            } else {
+                                powershell '& ./build.ps1 docker-init'
                             }
                         }
                         // This function is defined in the jenkins-infra/pipeline-library
diff --git a/build.ps1 b/build.ps1
index bb49c3a7d..e8de224d2 100644
--- a/build.ps1
+++ b/build.ps1
@@ -122,6 +122,22 @@ function Test-Image {
     return $failed
 }
 
+function Initialize-Docker() {
+    docker info
+    # Cf https://github.com/jenkins-infra/jenkins-infra/blob/production/modules/profile/templates/jenkinscontroller/casc/clouds-ec2.yaml.erb
+    $dockerDaemonConfigPath = 'C:\ProgramData\Docker\config\daemon.json'
+    if (Test-Path $dockerDaemonConfigPath) {
+        $dockerDaemonConfig = Get-Content -Path $dockerDaemonConfigPath -Raw | ConvertFrom-Json
+        Write-Host "${dockerDaemonConfigPath} file content:"
+        $dockerDaemonConfig | ConvertTo-Json
+    }
+    # System information
+    Get-ComputerInfo | Select-Object OsName, OsBuildNumber, WindowsVersion
+    Get-CimInstance -ClassName Win32_Processor | Out-String
+    Get-WindowsFeature Containers | Out-String
+    docker info
+}
+
 function Initialize-DockerComposeFile {
     param (
         [String] $AgentType,
@@ -173,6 +189,10 @@ Test-CommandExists 'docker-compose'
 Test-CommandExists 'docker buildx'
 Test-CommandExists 'yq'
 
+if($target -eq 'docker-init') {
+    Initialize-Docker
+}
+
 foreach($agentType in $AgentTypes) {
     $dockerComposeFile = 'build-windows_{0}_{1}.yaml' -f $AgentType, $ImageType
     $baseDockerCmd = 'docker-compose --file={0}' -f $dockerComposeFile

From 390a622db46af02b57032b56d29961a98d67211a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Thu, 29 Jan 2026 10:45:21 +0100
Subject: [PATCH 3/3] don't try to remove existing docker daemon config (we're
 not admin anymore :sweat_smile:)

---
 build.ps1 | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/build.ps1 b/build.ps1
index e8de224d2..f474c46f6 100644
--- a/build.ps1
+++ b/build.ps1
@@ -122,20 +122,13 @@ function Test-Image {
     return $failed
 }
 
-function Initialize-Docker() {
+function Get-DockerInfo() {
     docker info
-    # Cf https://github.com/jenkins-infra/jenkins-infra/blob/production/modules/profile/templates/jenkinscontroller/casc/clouds-ec2.yaml.erb
-    $dockerDaemonConfigPath = 'C:\ProgramData\Docker\config\daemon.json'
-    if (Test-Path $dockerDaemonConfigPath) {
-        $dockerDaemonConfig = Get-Content -Path $dockerDaemonConfigPath -Raw | ConvertFrom-Json
-        Write-Host "${dockerDaemonConfigPath} file content:"
-        $dockerDaemonConfig | ConvertTo-Json
-    }
-    # System information
+
+    # Additional system information
     Get-ComputerInfo | Select-Object OsName, OsBuildNumber, WindowsVersion
     Get-CimInstance -ClassName Win32_Processor | Out-String
     Get-WindowsFeature Containers | Out-String
-    docker info
 }
 
 function Initialize-DockerComposeFile {
@@ -190,7 +183,7 @@ Test-CommandExists 'docker buildx'
 Test-CommandExists 'yq'
 
 if($target -eq 'docker-init') {
-    Initialize-Docker
+    Get-DockerInfo
 }
 
 foreach($agentType in $AgentTypes) {