Skip to content

Commit

Permalink
ci: Remove dependency on libpcap.
Browse files Browse the repository at this point in the history
Since commit 98ee21e ("system-dpdk: Use dummy-pmd port for ..."),
DPDK unit tests don't require net/pcap driver anymore, and we can remove
this dependency when building DPDK and OVS in GHA.

Fixes: 98ee21e ("system-dpdk: Use dummy-pmd port for packet injection.")
Acked-by: Eelco Chaudron <[email protected]>
Signed-off-by: David Marchand <[email protected]>
Signed-off-by: Ilya Maximets <[email protected]>
  • Loading branch information
david-marchand authored and igsilya committed Oct 30, 2024
1 parent 2d93dfd commit c30ff22
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .ci/dpdk-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function build_dpdk()
# any DPDK driver.
# check-dpdk unit tests requires testpmd and some net/ driver.
DPDK_OPTS="$DPDK_OPTS -Denable_apps=test-pmd"
enable_drivers="net/null,net/af_xdp,net/tap,net/virtio,net/pcap"
enable_drivers="net/null,net/af_xdp,net/tap,net/virtio"
DPDK_OPTS="$DPDK_OPTS -Denable_drivers=$enable_drivers"
# OVS depends on the vhost library (and its dependencies).
# net/tap depends on the gso library.
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
build-dpdk:
env:
dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf
dependencies: gcc libbpf-dev libnuma-dev ninja-build pkgconf
CC: gcc
DPDK_GIT: https://dpdk.org/git/dpdk-stable
DPDK_VER: 23.11.2
Expand Down Expand Up @@ -79,8 +79,7 @@ jobs:
env:
dependencies: |
automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \
llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev \
lftp libreswan
llvm-dev libnuma-dev selinux-policy-dev libbpf-dev lftp libreswan
CC: ${{ matrix.compiler }}
DPDK: ${{ matrix.dpdk }}
DPDK_SHARED: ${{ matrix.dpdk_shared }}
Expand Down Expand Up @@ -271,8 +270,8 @@ jobs:
needs: build-dpdk
env:
dependencies: |
automake bc clang-tools libbpf-dev libnuma-dev libpcap-dev \
libunbound-dev libunwind-dev libssl-dev libtool llvm-dev
automake bc clang-tools libbpf-dev libnuma-dev libunbound-dev \
libunwind-dev libssl-dev libtool llvm-dev
CC: clang
DPDK: dpdk
CLANG_ANALYZE: true
Expand Down

0 comments on commit c30ff22

Please sign in to comment.