Skip to content

Commit 37776dd

Browse files
Merge pull request #26847 from arixmkii/win-build-timeout
Configurable GINKGOTIMEOUT in `winmake.ps1`
2 parents cdc2d4e + 10f9c9a commit 37776dd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

winmake.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ function Local-Unit {
6969
$skippackages+="pkg\domain\infra\abi,pkg\emulation,pkg\machine\apple,pkg\machine\applehv,pkg\machine\e2e,pkg\machine\libkrun,"
7070
$skippackages+="pkg\machine\provider,pkg\machine\proxyenv,pkg\machine\qemu,pkg\specgen\generate,pkg\systemd,test\e2e,test\utils,cmd\rootlessport,"
7171
$skippackages+="pkg\pidhandle"
72-
Run-Command "./bin/ginkgo.exe -vv -r --tags `"$remotetags`" --timeout=15m --trace --no-color --skip-package `"$skippackages`""
72+
if ($null -eq $ENV:GINKGOTIMEOUT) { $ENV:GINKGOTIMEOUT = '--timeout=15m' }
73+
Run-Command "./bin/ginkgo.exe -vv -r --tags `"$remotetags`" ${ENV:GINKGOTIMEOUT} --trace --no-color --skip-package `"$skippackages`""
7374
}
7475

7576
function Local-Machine {
@@ -86,7 +87,8 @@ function Local-Machine {
8687
$focus = "--focus ""$FOCUS"" --silence-skips"
8788
}
8889

89-
Run-Command "./bin/ginkgo.exe -vv --tags `"$remotetags`" --timeout=50m --trace --no-color $focus $files pkg/machine/e2e/."
90+
if ($null -eq $ENV:GINKGOTIMEOUT) { $ENV:GINKGOTIMEOUT = '--timeout=50m' }
91+
Run-Command "./bin/ginkgo.exe -vv --tags `"$remotetags`" ${ENV:GINKGOTIMEOUT} --trace --no-color $focus $files pkg/machine/e2e/."
9092
}
9193

9294
# Expect starting directory to be /podman

0 commit comments

Comments
 (0)