CI: run logformatter on the windows jobs again - #29376
Open
Somay-kousis wants to merge 1 commit into
Open
Conversation
Run-Command in hack/ci/win-lib.ps1 only calls Invoke-Logformatter when CIRRUS_CI is "true". That variable went away with .cirrus.yml in 3743b9f ("Goodbye Cirrus"), so on the windows jobs the branch is never taken and we get the raw ginkgo output with no HTML log at all. winmake.ps1 sources this file and the workflow calls winmake.ps1 in four jobs, so this covers windows installer, unit, e2e and machine. I used PODMAN_CI set from the workflow instead of checking GITHUB_ACTIONS, because GITHUB_ACTIONS is true for anyone running our tests from their own workflow in a fork, and they will not necessarily have perl. The github hosted windows-2025 image does ship perl 5.42, so it is fine for us. This only turns the call back on. podman-container-tools#29091 is doing the logformatter side for the linux jobs and does not touch win-lib.ps1, so the two should not collide. Signed-off-by: Somay-kousis <somaykousis@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
.cirrus.yml was the only thing setting CIRRUS_CI and it went away with 3743b9f ("Goodbye Cirrus"). Run-Command in hack/ci/win-lib.ps1 still checks for it before calling Invoke-Logformatter, so on the windows jobs that call just never happens and we get the raw ginkgo output with no html log at all.
winmake.ps1 sources that file and ci.yml calls winmake in four jobs, so this is windows installer, unit, e2e and machine.
I went with a PODMAN_CI set from the workflow instead of checking GITHUB_ACTIONS. GITHUB_ACTIONS is true for anyone running our tests out of their own workflow in a fork and they won't necessarily have perl, saw the same point come up on #29301. The github hosted windows-2025 image ships perl 5.42 so our own jobs are fine.
This only turns the call back on, I didn't touch logformatter itself. #29091 is doing that side for linux and doesn't touch win-lib.ps1, so I don't think these conflict. Happy to rebase if that one lands first.
One thing I left alone on purpose: lines 35-39 of the same file still Remove-Item CIRRUS_COMMIT_MESSAGE / CIRRUS_CHANGE_MESSAGE / CIRRUS_PR_BODY, which are also dead now. That felt like mixing cleanup into a behaviour fix so I skipped it.
I can't run the windows jobs locally, so I'm leaning on CI here to confirm the html log actually turns up.