Skip to content

chore(windows): fortify build scripts against environment leaks and silent crashes #2412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Piyush0049 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore(windows): fortify build scripts against environment leaks and silent crashes #2412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91bc0a4
chore(windows): fortify build scripts against environment leaks and s…
Piyush0049 Jul 16, 2026
c5b23d2
Merge remote-tracking branch 'upstream/master' into chore/windows-bui…
Piyush0049 Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 42 additions & 31 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Function Test-CommandExists {
}
}
Catch {
"$command does not exist"
Write-Error "$command does not exist"
}
Finally {
$ErrorActionPreference = $oldPreference
Expand All @@ -85,28 +85,30 @@ function Test-Image {
$env:DOCKERHUB_ORG_REPO = $orgRepo
$env:CONTROLLER_TAG = $tag

$targetPath = '.\target\{0}' -f $tag
if (Test-Path $targetPath) {
Remove-Item -Recurse -Force $targetPath
}
New-Item -Path $targetPath -Type Directory | Out-Null
$configuration.TestResult.OutputPath = '{0}\junit-results.xml' -f $targetPath

$TestResults = Invoke-Pester -Configuration $configuration
$failed = $false
if (($TestResults.FailedCount + $TestResults.FailedBlocksCount + $TestResults.FailedContainersCount) -gt 0) {
Write-Host "Failure(s) in ${tag}:"
Write-Host "- $TestResults.FailedCount failed test(s)"
Write-Host "- $TestResults.FailedBlocksCount failed BeforeAll/AfterAll block(s)"
Write-Host "- $TestResults.FailedContainersCount file(s) that errored during discovery or failed to load"
$failed = $true
} else {
Write-Host "There were $($TestResults.PassedCount) passed tests out of $($TestResults.TotalCount) in $tag"
try {
$targetPath = '.\target\{0}' -f $tag
if (Test-Path $targetPath) {
Remove-Item -Recurse -Force $targetPath
}
New-Item -Path $targetPath -Type Directory | Out-Null
$configuration.TestResult.OutputPath = '{0}\junit-results.xml' -f $targetPath

$TestResults = Invoke-Pester -Configuration $configuration
$failed = $false
if (($TestResults.FailedCount + $TestResults.FailedBlocksCount + $TestResults.FailedContainersCount) -gt 0) {
Write-Host "Failure(s) in ${tag}:"
Write-Host "- $TestResults.FailedCount failed test(s)"
Write-Host "- $TestResults.FailedBlocksCount failed BeforeAll/AfterAll block(s)"
Write-Host "- $TestResults.FailedContainersCount file(s) that errored during discovery or failed to load"
$failed = $true
} else {
Write-Host "There were $($TestResults.PassedCount) passed tests out of $($TestResults.TotalCount) in $tag"
}
} finally {
Remove-Item env:\DOCKERHUB_ORG_REPO -ErrorAction SilentlyContinue
Remove-Item env:\CONTROLLER_TAG -ErrorAction SilentlyContinue
}

Remove-Item env:\DOCKERHUB_ORG_REPO
Remove-Item env:\CONTROLLER_TAG

return $failed
}
function Test-IsLatestJenkinsRelease {
Expand Down Expand Up @@ -169,6 +171,7 @@ function Initialize-DockerComposeFile {
$windowsVersion = $items[1]

# Override the list of Windows versions taken defined in docker-bake.hcl by the version from image type
if (Test-Path env:\WINDOWS_VERSION_OVERRIDE) { $oldOverride = $env:WINDOWS_VERSION_OVERRIDE } else { $oldOverride = $null }
$env:WINDOWS_VERSION_OVERRIDE = $windowsVersion

# Retrieve the targets from docker buildx bake --print output
Expand All @@ -185,16 +188,22 @@ function Initialize-DockerComposeFile {
$yqServicesQuery = $yqServicesQuery -replace '"', '\"'
}

# - Use docker buildx bake to output image definitions from the "<windowsFlavor>" bake target
# - Convert with yq to the format expected by docker compose
# - Store the result in the docker compose file
docker buildx bake --progress=quiet --file=docker-bake.hcl --file docker-bake.override.json $windowsFlavor --print |
yq --prettyPrint $yqMainQuery |
yq $yqServicesQuery |
Out-File -FilePath $DockerComposeFile

# Remove override
Remove-Item env:\WINDOWS_VERSION_OVERRIDE
try {
# - Use docker buildx bake to output image definitions from the "<windowsFlavor>" bake target
# - Convert with yq to the format expected by docker compose
# - Store the result in the docker compose file
docker buildx bake --progress=quiet --file=docker-bake.hcl --file docker-bake.override.json $windowsFlavor --print |
yq --prettyPrint $yqMainQuery |
yq $yqServicesQuery |
Out-File -FilePath $DockerComposeFile
} finally {
# Restore or remove override
if ($null -ne $oldOverride) {
$env:WINDOWS_VERSION_OVERRIDE = $oldOverride
} else {
Remove-Item env:\WINDOWS_VERSION_OVERRIDE -ErrorAction SilentlyContinue
}
}
}

Test-CommandExists 'docker'
Expand All @@ -214,8 +223,10 @@ $isJenkinsVersionLatest = Test-IsLatestJenkinsRelease -Version $JenkinsVersion
if ($JenkinsVersion.Split('.').Count -eq 3) {
$releaseLine = 'war-stable'
$env:LATEST_LTS = If ($isJenkinsVersionLatest) { "true" } Else { "false" }
Remove-Item env:\LATEST_WEEKLY -ErrorAction SilentlyContinue
} else {
$env:LATEST_WEEKLY = If ($isJenkinsVersionLatest) { "true" } Else { "false" }
Remove-Item env:\LATEST_LTS -ErrorAction SilentlyContinue
}

# If there is no WAR_URL set, using get.jenkins.io URL depending on the release line
Expand Down
20 changes: 14 additions & 6 deletions tests/test_helpers.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function Get-SutImage {
$DOCKERFILE = 'windows/windowsservercore/hotspot/Dockerfile'
$IMAGETAG = Get-EnvOrDefault 'CONTROLLER_TAG' ''

$REAL_DOCKERFILE=Resolve-Path -Path "$PSScriptRoot/../${DOCKERFILE}"
$REAL_DOCKERFILE = Join-Path -Path $PSScriptRoot -ChildPath "../$DOCKERFILE"

if(!($DOCKERFILE -match '^(?<os>.+)[\\/](?<flavor>.+)[\\/](?<jvm>.+)[\\/]Dockerfile$') -or !(Test-Path $REAL_DOCKERFILE)) {
Write-Error "Wrong Dockerfile path format or file does not exist: $DOCKERFILE"
Expand Down Expand Up @@ -118,8 +118,12 @@ function Build-Docker($tag) {
}

function Build-DockerChild($tag, $dir) {
Get-Content "$dir/Dockerfile-windows" | ForEach-Object{$_ -replace "FROM bats-jenkins","FROM $(Get-SutImage)" } | Out-File -FilePath "$dir/Dockerfile-windows.tmp" -Encoding ASCII
return (Run-Program 'docker.exe' "build -t `"$tag`" $args -f `"$dir/Dockerfile-windows.tmp`" `"$dir`"")
try {
Get-Content "$dir/Dockerfile-windows" | ForEach-Object{$_ -replace "FROM bats-jenkins","FROM $(Get-SutImage)" } | Out-File -FilePath "$dir/Dockerfile-windows.tmp" -Encoding ASCII
return (Run-Program 'docker.exe' "build -t `"$tag`" $args -f `"$dir/Dockerfile-windows.tmp`" `"$dir`"")
} finally {
if (Test-Path "$dir/Dockerfile-windows.tmp") { Remove-Item "$dir/Dockerfile-windows.tmp" -ErrorAction SilentlyContinue }
}
}

function Get-JenkinsUrl($Container) {
Expand All @@ -129,9 +133,13 @@ function Get-JenkinsUrl($Container) {
}

function Get-JenkinsPassword($Container) {
$res = docker exec $Container powershell.exe -c 'if(Test-Path "C:\ProgramData\Jenkins\JenkinsHome\secrets\initialAdminPassword") { Get-Content "C:\ProgramData\Jenkins\JenkinsHome\secrets\initialAdminPassword" ; exit 0 } else { exit -1 }'
if($lastExitCode -eq 0) {
return $res
try {
$res = docker exec $Container powershell.exe -c 'if(Test-Path "C:\ProgramData\Jenkins\JenkinsHome\secrets\initialAdminPassword") { Get-Content "C:\ProgramData\Jenkins\JenkinsHome\secrets\initialAdminPassword" ; exit 0 } else { exit -1 }'
if($LASTEXITCODE -eq 0) {
return $res
}
} catch {
# Catch terminating errors thrown by native commands in strict mode
}
return $null
}
Expand Down