From 12d6aa78fef2f4e818669c3a9bf475cdd8a6e10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Sat, 14 Feb 2026 17:55:30 +0100 Subject: [PATCH] chore(make.ps1): include Jenkins version to compose filename --- make.ps1 | 2 +- tests/test_helpers.psm1 | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/make.ps1 b/make.ps1 index dda2d90b82..0ea10a9902 100644 --- a/make.ps1 +++ b/make.ps1 @@ -220,7 +220,7 @@ if([String]::IsNullOrWhiteSpace($env:WAR_URL)) { $env:WAR_URL = 'https://get.jenkins.io/{0}/{1}/jenkins.war' -f $releaseLine, $JenkinsVersion } -$dockerComposeFile = 'build-windows_{0}.yaml' -f $ImageType +$dockerComposeFile = 'build-windows_{0}_{1}.yaml' -f $ImageType, $JenkinsVersion $baseDockerCmd = 'docker-compose --file={0}' -f $dockerComposeFile $baseDockerBuildCmd = '{0} build --parallel --pull' -f $baseDockerCmd diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1 index 86197e5b47..c98cad99dd 100644 --- a/tests/test_helpers.psm1 +++ b/tests/test_helpers.psm1 @@ -106,11 +106,10 @@ function Run-Program($cmd, $params, $verbose=$false) { } function Build-Docker($tag) { - $windowsVersion = '2019' - if ($tag -match 'ltsc(\d+)$') { - $windowsVersion = $matches[1] - } - $composeParams = '--file=build-windows_windowsservercore-ltsc{0}.yaml build --parallel' -f $windowsVersion + # Ex of tag: pester-jenkins-2.550-jdk21-hotspot-windowsservercore-ltsc2022 + $windowsVersion = $tag.replace('pester-jenkins-', '').split('-')[4] + $jenkinsVersion = $tag.replace('pester-jenkins-', '').split('-')[0] + $composeParams = '--file=build-windows_windowsservercore-{0}_{1}.yaml build --parallel' -f $windowsVersion, $jenkinsVersion $exitCode, $stdout, $stderr = Run-Program 'docker-compose' $composeParams if($exitCode -ne 0) { return $exitCode, $stdout, $stderr