Skip to content

Comments

windows: fix CI issues#1879

Merged
lmb merged 3 commits intocilium:mainfrom
lmb:windows-program-sample
Oct 16, 2025
Merged

windows: fix CI issues#1879
lmb merged 3 commits intocilium:mainfrom
lmb:windows-program-sample

Conversation

@lmb
Copy link
Contributor

@lmb lmb commented Oct 14, 2025

Fix Windows CI breaking due to microsoft/ebpf-for-windows#4662 by switching to a different program type which is distributed as part of sample_ebpf_ext. Unfortunately Windows stricter requirements on BPF_PROG_RUN for this program type. Instead of adding lots of Windows specific code to tests we break Program.Benchmark and Program.Test and add some compat code in there.

See the individual commit messages for more context.

Linux doesn't care whether we provide an output buffer, Windows does
and returns an opaque EOTHER.

Signed-off-by: Lorenz Bauer <[email protected]>
@github-actions github-actions bot added the breaking-change Changes exported API label Oct 14, 2025
@lmb lmb force-pushed the windows-program-sample branch 3 times, most recently from 1174c41 to 92f79da Compare October 14, 2025 14:34
@lmb lmb marked this pull request as ready for review October 14, 2025 14:43
@lmb lmb requested review from a team, dylandreimerink, florianl and ti-mo as code owners October 14, 2025 14:43
@lmb lmb mentioned this pull request Oct 15, 2025
Copy link
Contributor

@florianl florianl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a first look, the changes are fine for me and I just have minor comments. Will have a second look.

@lmb lmb force-pushed the windows-program-sample branch from 92f79da to 851e608 Compare October 16, 2025 14:07
@github-actions github-actions bot removed the breaking-change Changes exported API label Oct 16, 2025
lmb added 2 commits October 16, 2025 15:15
The upstream efW removed the XDP_TEST program type from the repository.
We rely on this type for our unit tests. Switch tests to the SAMPLE
program type, which is a separate driver but also distributed as part
of the efW runtime.

On Windows, running a SAMPLE program requires providing a (possibly
empty) context. To avoid having to change a lot of tests over and over
we introduce a new mustRun helper.

See: microsoft/ebpf-for-windows#4662
Signed-off-by: Lorenz Bauer <[email protected]>
Switch from using setup-ebpf.ps1 to install_ebpf.psm1. This is what
efW is doing for their CI as well.

Signed-off-by: Lorenz Bauer <[email protected]>
@lmb lmb force-pushed the windows-program-sample branch from 851e608 to 98d0b08 Compare October 16, 2025 14:16
@lmb lmb merged commit e6e4707 into cilium:main Oct 16, 2025
17 of 18 checks passed
@lmb lmb deleted the windows-program-sample branch October 16, 2025 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants