Skip to content

Commit

Permalink
Use logformatter for podman_machine_windows_task
Browse files Browse the repository at this point in the history
#21760

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
  • Loading branch information
l0rd committed Mar 11, 2024
1 parent 1cbedfb commit 2a6b7a1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,11 @@ podman_machine_windows_task:
TEST_FLAVOR: "machine-hyperv"
clone_script: *winclone
main_script: ".\\repo\\contrib\\cirrus\\win-podman-machine-main.ps1"
always:
# Required for `contrib/cirrus/logformatter` to work properly
html_artifacts:
path: ./repo/*.html
type: text/html


podman_machine_mac_task:
Expand Down
9 changes: 8 additions & 1 deletion contrib/cirrus/win-podman-machine-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,12 @@ Run-Command ".\bin\windows\podman.exe --version"
New-Item -ItemType "directory" -Path "$env:AppData\containers"
Copy-Item -Path pkg\machine\ocipull\policy.json -Destination "$env:AppData\containers"

# Install Perl
Write-Host "`nInstalling Perl as it is required to use logformatter"
Run-Command 'choco install --no-progress --confirm --acceptlicense --nocolor StrawberryPerl'
Write-Host "`nAdd perl to the PATH"
Set-Item "Env:PATH" "$Env:PATH;C:\Strawberry\perl\bin"

# Run the tests
Write-Host "`nRunning podman-machine e2e tests"
Run-Command ".\winmake localmachine"
Run-Command '.\winmake localmachine | perl .\contrib\cirrus\logformatter $Env:TEST_FLAVOR-podman-windows-rootless-host-sqlite'

0 comments on commit 2a6b7a1

Please sign in to comment.