Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpf: fix test configuration for 5.10 and 6.1 kernels #29999

Merged
merged 2 commits into from Jan 3, 2024
Merged

bpf: fix test configuration for 5.10 and 6.1 kernels #29999

merged 2 commits into from Jan 3, 2024

Conversation

julianwiedmann
Copy link
Member

@julianwiedmann julianwiedmann commented Dec 20, 2023 •
edited

#29349 added complexity tests for 6.1. But we also want to select the relevant features for the build tests.

Also select the correct mcpu for 5.10 and 6.1 kernels.

@julianwiedmann julianwiedmann added area/CI Continuous Integration testing issue or flake sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/ci This PR makes changes to the CI. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Dec 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in v1.15.0-rc.1 Dec 20, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.6 Dec 20, 2023
@julianwiedmann julianwiedmann marked this pull request as ready for review December 20, 2023 07:34
@julianwiedmann julianwiedmann requested a review from a team as a code owner December 20, 2023 07:34
@julianwiedmann julianwiedmann requested a review from a team as a code owner January 2, 2024 11:25
@julianwiedmann julianwiedmann changed the title bpf: add 6.1 kernel support for build tests bpf: fix test configuration for 5.10 and 6.1 kernels Jan 2, 2024
@julianwiedmann
Copy link
Member Author

/test

lmb
lmb reviewed Jan 3, 2024
View reviewed changes
bpf/Makefile Show resolved Hide resolved
@julianwiedmann
bpf: add 6.1 kernel support for build tests
555afde 
cilium#29349 added complexity tests for 6.1.
But we also want to select the relevant features for the build tests.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
bpf: use v3 mcpu for tests with 5.10 and 6.1 kernel
7e2a1b3 
We want to mimic GetBPFCPU(), which selects mcpu=v3 for 5.10+ kernels.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann
Copy link
Member Author

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 3, 2024
@julianwiedmann julianwiedmann added this pull request to the merge queue Jan 3, 2024
Merged via the queue into cilium:main with commit f8a7616 Jan 3, 2024
62 checks passed
@julianwiedmann julianwiedmann deleted the 1.16-bpf-makefile branch January 3, 2024 16:47
@jibi jibi mentioned this pull request Jan 11, 2024
Merged
9 tasks
@jibi jibi added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jan 11, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.6 Jan 11, 2024
@jibi jibi mentioned this pull request Jan 12, 2024
Merged
32 tasks
@jibi jibi added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Jan 12, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.15 in v1.15.0-rc.1 Jan 12, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Jan 15, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.14 in 1.14.6 Jan 15, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.6 Jan 15, 2024
@aanm aanm mentioned this pull request Jan 16, 2024
Merged
@gentoo-root gentoo-root mentioned this pull request Jan 17, 2024
Merged
@giorio94 giorio94 added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Jan 29, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.15 to Backport done to v1.15 in v1.15.0-rc.1 Jan 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmb lmb lmb approved these changes

@jibi jibi jibi approved these changes

Assignees
No one assigned
Labels
area/CI Continuous Integration testing issue or flake backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
No open projects
v1.15.0-rc.1
Backport done to v1.15
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@julianwiedmann @jibi @lmb @giorio94