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

[v1.14] CI: fix broken BPF complexity tests #29553

Merged
merged 2 commits into from
Dec 5, 2023
Merged

[v1.14] CI: fix broken BPF complexity tests #29553

merged 2 commits into from
Dec 5, 2023

Conversation

lmb
Copy link
Contributor

@lmb lmb commented Dec 1, 2023

test/verifier: fix complexity tests not being recompiled

[ upstream commit 735807fb16806abf13c71c936efbf887b8ee00a5 ]

TestVerifier is accidentally reusing the result of previous subtest 
compilations. This means that only the first set of configurations was
tested.

Invoke clean for every new compilation. The generated object files are moved
to the test directory to make them accessible as artifacts from CI.

Fixes: d3ef5b2ac8 ("test/verifier: Avoid pruning object files before testing
the next file") Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

test/verifier: improve log output

[ upstream commit 1e71a19a5db1f411b4e804d3f798e7b454168e13 ]

Include the command invoked to compile the BPF and the output of the command
in the test output by default.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>

@lmb
test/verifier: fix complexity tests not being recompiled
5c97c98 
[ upstream commit 735807f ]

TestVerifier is accidentally reusing the result of previous subtest
compilations. This means that only the first set of configurations was tested.

Invoke clean for every new compilation. The generated object files are
moved to the test directory to make them accessible as artifacts from CI.

Fixes: d3ef5b2 ("test/verifier: Avoid pruning object files before testing the next file")
Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
@lmb
test/verifier: improve log output
0772e46 
[ upstream commit 1e71a19 ]

Include the command invoked to compile the BPF and the output of
the command in the test output by default.

Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
@lmb lmb added area/CI Continuous Integration testing issue or flake sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. kind/backports This PR provides functionality previously merged into master. release-note/misc This PR makes changes that have no direct user impact. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Dec 1, 2023
@lmb lmb mentioned this pull request Dec 1, 2023
Merged
@julianwiedmann
Copy link
Member

/ci-verifier

@lmb
Copy link
Contributor Author

lmb commented Dec 1, 2023

/test-backport-1.14

@lmb lmb marked this pull request as ready for review December 1, 2023 16:10
@lmb lmb requested review from a team as code owners December 1, 2023 16:10
@lmb lmb requested review from ldelossa and brlbil December 1, 2023 16:10
ldelossa
ldelossa approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@ldelossa ldelossa left a comment

Choose a reason for hiding this comment

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

LGTM

@ysksuzuki ysksuzuki mentioned this pull request Dec 5, 2023
Merged
@lmb
Copy link
Contributor Author

lmb commented Dec 5, 2023

@brlbil PTAL!

viktor-kurchenko
viktor-kurchenko approved these changes Dec 5, 2023
View reviewed changes
Copy link
Contributor

@viktor-kurchenko viktor-kurchenko left a comment

Choose a reason for hiding this comment

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

LGTM.

@julianwiedmann julianwiedmann added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 5, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 5, 2023
@ti-mo ti-mo merged commit 0792b88 into cilium:v1.14 Dec 5, 2023
60 checks passed
@nebril nebril mentioned this pull request Dec 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-mo ti-mo ti-mo approved these changes

@ldelossa ldelossa ldelossa approved these changes

@youngnick youngnick youngnick approved these changes

@viktor-kurchenko viktor-kurchenko viktor-kurchenko approved these changes

@brlbil brlbil Awaiting requested review from brlbil brlbil is a code owner automatically assigned from cilium/github-sec

Assignees
No one assigned
Labels
area/CI Continuous Integration testing issue or flake backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lmb @julianwiedmann @ti-mo @ldelossa @youngnick @viktor-kurchenko