mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #39878 from thaJeztah/cut_the_tail
hack/ci/windows.ps1: stop tailing logs after stopping the daemon
This commit is contained in:
commit
6d8c5bc181
1 changed files with 8 additions and 1 deletions
|
@ -608,7 +608,8 @@ Try {
|
||||||
|
|
||||||
# Start tailing the daemon under test if the command is installed
|
# Start tailing the daemon under test if the command is installed
|
||||||
if ($null -ne (Get-Command "tail" -ErrorAction SilentlyContinue)) {
|
if ($null -ne (Get-Command "tail" -ErrorAction SilentlyContinue)) {
|
||||||
$tail = start-process "tail" -ArgumentList "-f $env:TEMP\dut.out" -ErrorAction SilentlyContinue
|
Write-Host -ForegroundColor green "INFO: Start tailing logs of the daemon under tests"
|
||||||
|
$tail = Start-Process "tail" -ArgumentList "-f $env:TEMP\dut.out" -PassThru -ErrorAction SilentlyContinue
|
||||||
}
|
}
|
||||||
|
|
||||||
# Verify we can get the daemon under test to respond
|
# Verify we can get the daemon under test to respond
|
||||||
|
@ -942,6 +943,12 @@ Try {
|
||||||
Remove-Item "$env:TEMP\docker.pid" -force -ErrorAction SilentlyContinue
|
Remove-Item "$env:TEMP\docker.pid" -force -ErrorAction SilentlyContinue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Stop the tail process (if started)
|
||||||
|
if ($null -ne $tail) {
|
||||||
|
Write-Host -ForegroundColor green "INFO: Stop tailing logs of the daemon under tests"
|
||||||
|
Stop-Process -InputObject $tail -Force
|
||||||
|
}
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "INFO: executeCI.ps1 Completed successfully at $(Get-Date)."
|
Write-Host -ForegroundColor Green "INFO: executeCI.ps1 Completed successfully at $(Get-Date)."
|
||||||
}
|
}
|
||||||
Catch [Exception] {
|
Catch [Exception] {
|
||||||
|
|
Loading…
Reference in a new issue