From c30ff22b5d5c953da58733d87642050ec206f3f6 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 28 Oct 2024 11:23:43 +0100 Subject: [PATCH] ci: Remove dependency on libpcap. Since commit 98ee21ef6364 ("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: 98ee21ef6364 ("system-dpdk: Use dummy-pmd port for packet injection.") Acked-by: Eelco Chaudron Signed-off-by: David Marchand Signed-off-by: Ilya Maximets --- .ci/dpdk-build.sh | 2 +- .github/workflows/build-and-test.yml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.ci/dpdk-build.sh b/.ci/dpdk-build.sh index e1b8e3ccbb4..991b272ea13 100755 --- a/.ci/dpdk-build.sh +++ b/.ci/dpdk-build.sh @@ -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. diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 827d3ae315d..421b3d860be 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -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 @@ -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 }} @@ -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