From 7cb8bc1ceefc22ed7baa016d854f51493f82e45e Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Mon, 4 Mar 2024 12:05:58 +0100 Subject: [PATCH] ci: Install newer version of scapy. ovn-org/ovn/b7fe2c8b1b08 makes use of scapy features that are not available in scapy 2.4.4 as shipped with ubuntu-22.04. This works in the ovn repository because they run the testsuites from purpose built containers instead of directly on the GitHub Actions runner image. For now let's just install the scapy dependency from pip instead. Reported-at: https://launchpad.net/bugs/2055862 Signed-off-by: Frode Nordahl --- .github/workflows/tests.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 2fce2c5..d737fbf 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -7,10 +7,12 @@ on: jobs: build-linux: env: - dependencies: | + apt-dependencies: | automake libtool gcc bc libssl-dev llvm-dev libelf-dev \ libnuma-dev libpcap-dev ncat libunbound-dev libunwind-dev \ - libudev-dev python3-scapy + libudev-dev python3-pip + pip-dependencies: | + scapy CC: ${{ matrix.compiler }} TESTSUITE: ${{ matrix.testsuite }} ASAN: ${{ matrix.asan }} @@ -55,7 +57,8 @@ jobs: set -euxo pipefail sudo apt update sudo apt remove -y netcat-openbsd - sudo apt -y install ${{ env.dependencies }} + sudo apt -y install ${{ env.apt-dependencies }} + sudo pip install ${{ env.pip-dependencies }} - name: build OVS run: |