Skip to content

Conversation

joamaki
Copy link
Contributor

@joamaki joamaki commented Oct 18, 2021

Once this PR is merged, you can update the PR labels via:

$ for pr in 17364 17408; do contrib/backporting/set-labels.py $pr done 1.9; done

pchaigno and others added 2 commits October 18, 2021 12:05
[ upstream commit 225069a ]

In bpf/Makefile, we use environment variables MAX_XXX_OPTIONS to define
the options to use when trying to maximize the program sizes for
complexity tests. This commit simply makes it possible to override these
variables from the command line, to generate different programs for
complexity tests. For example, one can run:

    $ MAX_HOST_OPTIONS="-DENABLE_IPV4 -DENABLE_IPV6" make -C bpf bpf_host.o

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 422458d ]

verifier-test.sh allows users to pass what programs to test via
environment variables. However, these variables are only used if they
are  not unset and not empty. This means that we, for example, cannot
pass XDP_PROGS="" to avoid verifiying any xdp progs.

This patch modifies the check to only ignore the environment variables
if they are unset.

So now we can use verifier-test.sh to test only a single program:

root# TC_PROGS="bpf_host" XDP_PROGS="" CG_PROGS="" ./test/bpf/verifier-test.sh
=> Loading bpf_host.c:from-netdev...
=> Loading bpf_host.c:from-host...
=> Loading bpf_host.c:to-netdev...
=> Loading bpf_host.c:to-host...

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
@joamaki joamaki requested a review from a team as a code owner October 18, 2021 10:08
@joamaki joamaki added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Oct 18, 2021
@joamaki joamaki requested review from pchaigno and kkourt October 18, 2021 11:07
@joamaki
Copy link
Contributor Author

joamaki commented Oct 18, 2021

/test-backport-1.9

Job 'Cilium-PR-K8s-1.14-kernel-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sHealthTest checks cilium-health status between nodes

Failure Output

FAIL: Expected

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.14-kernel-4.9 so I can create a new GitHub issue to track it.

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

I reviewed both commits.

@joamaki
Copy link
Contributor Author

joamaki commented Oct 18, 2021

Test failures not from the changes in this PR. Merging.

@joamaki joamaki merged commit 2aa1cb4 into cilium:v1.9 Oct 18, 2021
@joamaki joamaki deleted the pr/v1.9-backport-2021-10-18 branch October 18, 2021 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants