diff --git a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml index 8a2b195c..4b77bbdd 100644 --- a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml +++ b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/advanced-lb-sanity.yml b/.github/workflows/advanced-lb-sanity.yml index 02669868..48e5e38a 100644 --- a/.github/workflows/advanced-lb-sanity.yml +++ b/.github/workflows/advanced-lb-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml index 6dddd674..a2eb30f4 100644 --- a/.github/workflows/basic-sanity-ubuntu-22.yml +++ b/.github/workflows/basic-sanity-ubuntu-22.yml @@ -1,11 +1,17 @@ name: Sanity-CI-Ubuntu-22 on: - push: - branches: - - main pull_request: branches: [ "main" ] workflow_dispatch: + inputs: + testName: + description: 'Test Run-Name' + required: true + default: 'Sanity-BuildCI-u22' + workflow_run: + workflows: ["Build-CI"] + types: + - completed jobs: build: name: basic-sanity-ubuntu-22 @@ -34,11 +40,11 @@ jobs: sudo ip netns add test sudo ip netns del test - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - @@ -66,5 +72,5 @@ jobs: - name: Publish the latest loxilb Docker image if: | - github.repository == 'loxilb-io/loxilb' && github.event_name != 'pull_request' + github.repository == 'loxilb-io/loxilb' && (github.event_name == 'workflow_run' || github.event_name == 'workflow_dispatch') run: docker push ghcr.io/loxilb-io/loxilb:latestu22 diff --git a/.github/workflows/basic-sanity.yml b/.github/workflows/basic-sanity.yml index 741c80a3..f4afa8ab 100644 --- a/.github/workflows/basic-sanity.yml +++ b/.github/workflows/basic-sanity.yml @@ -22,11 +22,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev elfutils dwarves git linux-tools-$(uname -r) libbsd-dev bridge-utils unzip build-essential bison flex iproute2 - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/cluster-sanity-ubuntu-22.yml b/.github/workflows/cluster-sanity-ubuntu-22.yml index c82eece1..95eca4ad 100644 --- a/.github/workflows/cluster-sanity-ubuntu-22.yml +++ b/.github/workflows/cluster-sanity-ubuntu-22.yml @@ -25,11 +25,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/cluster-sanity.yml b/.github/workflows/cluster-sanity.yml index adeafb10..89d15b88 100644 --- a/.github/workflows/cluster-sanity.yml +++ b/.github/workflows/cluster-sanity.yml @@ -25,11 +25,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/data-store-CI.yml b/.github/workflows/data-store-CI.yml index 6f75a8a0..9f562437 100644 --- a/.github/workflows/data-store-CI.yml +++ b/.github/workflows/data-store-CI.yml @@ -40,11 +40,11 @@ jobs: - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/ipsec-sanity-ubuntu-22.yml b/.github/workflows/ipsec-sanity-ubuntu-22.yml index 409dbd93..da816bf9 100644 --- a/.github/workflows/ipsec-sanity-ubuntu-22.yml +++ b/.github/workflows/ipsec-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/ipsec-sanity.yml b/.github/workflows/ipsec-sanity.yml index 4350af60..7a34488d 100644 --- a/.github/workflows/ipsec-sanity.yml +++ b/.github/workflows/ipsec-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/liveness-sanity-ubuntu-22.yml b/.github/workflows/liveness-sanity-ubuntu-22.yml index 1edb53c9..d5983ab8 100644 --- a/.github/workflows/liveness-sanity-ubuntu-22.yml +++ b/.github/workflows/liveness-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml index 47c00a36..ddeadc1d 100644 --- a/.github/workflows/liveness-sanity.yml +++ b/.github/workflows/liveness-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/nat66-sanity-ubuntu-22.yml b/.github/workflows/nat66-sanity-ubuntu-22.yml index 0bafc76c..870dd3aa 100644 --- a/.github/workflows/nat66-sanity-ubuntu-22.yml +++ b/.github/workflows/nat66-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/nat66-sanity.yml b/.github/workflows/nat66-sanity.yml index d6dacc17..4938899c 100644 --- a/.github/workflows/nat66-sanity.yml +++ b/.github/workflows/nat66-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 9171ab5f..a14baaa9 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -36,11 +36,11 @@ jobs: - run: if [[ ${{ matrix.os }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat iperf3 - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/scale-sanity-ubuntu-22.yml b/.github/workflows/scale-sanity-ubuntu-22.yml index 1d54b23f..50eb2c07 100644 --- a/.github/workflows/scale-sanity-ubuntu-22.yml +++ b/.github/workflows/scale-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/scale-sanity.yml b/.github/workflows/scale-sanity.yml index 97473df4..ca4d8807 100644 --- a/.github/workflows/scale-sanity.yml +++ b/.github/workflows/scale-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/sctp-sanity-ubuntu-22.yml b/.github/workflows/sctp-sanity-ubuntu-22.yml index 0ca706a7..92b3e3cb 100644 --- a/.github/workflows/sctp-sanity-ubuntu-22.yml +++ b/.github/workflows/sctp-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/sctp-sanity.yml b/.github/workflows/sctp-sanity.yml index 94d6f109..07f9cf45 100644 --- a/.github/workflows/sctp-sanity.yml +++ b/.github/workflows/sctp-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml index 2cb4ad73..0f01a8de 100644 --- a/.github/workflows/tcp-sanity-ubuntu-22.yml +++ b/.github/workflows/tcp-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/tcp-sanity.yml b/.github/workflows/tcp-sanity.yml index 905af16f..7090a78d 100644 --- a/.github/workflows/tcp-sanity.yml +++ b/.github/workflows/tcp-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/test-scenario.yml b/.github/workflows/test-scenario.yml index 1b0933f0..e1488dfa 100644 --- a/.github/workflows/test-scenario.yml +++ b/.github/workflows/test-scenario.yml @@ -32,11 +32,11 @@ jobs: - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/udp-sanity-ubuntu-22.yml b/.github/workflows/udp-sanity-ubuntu-22.yml index 304d7393..8ac6ab24 100644 --- a/.github/workflows/udp-sanity-ubuntu-22.yml +++ b/.github/workflows/udp-sanity-ubuntu-22.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/udp-sanity.yml b/.github/workflows/udp-sanity.yml index 7da71a04..3bcd88b2 100644 --- a/.github/workflows/udp-sanity.yml +++ b/.github/workflows/udp-sanity.yml @@ -30,11 +30,11 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/Dockerfile b/Dockerfile index 2cce358b..f3960713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,19 +19,19 @@ RUN mkdir -p /opt/loxilb && \ apt-get update && apt-get install -y wget && \ arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && if [ "$arch" = "arm64" ] ; then apt-get install -y gcc-multilib-arm-linux-gnueabihf; else apt-get update && apt-get install -y gcc-multilib;fi && \ # Arch specific packages - GoLang - wget https://go.dev/dl/go1.21.5.linux-${arch}.tar.gz && tar -xzf go1.21.5.linux-${arch}.tar.gz --directory /usr/local/ && rm go1.21.5.linux-${arch}.tar.gz && \ + wget https://go.dev/dl/go1.22.0.linux-${arch}.tar.gz && tar -xzf go1.22.0.linux-${arch}.tar.gz --directory /usr/local/ && rm go1.22.0.linux-${arch}.tar.gz && \ # Dev and util packages apt-get install -y clang llvm libelf-dev libpcap-dev vim net-tools \ elfutils dwarves git libbsd-dev bridge-utils wget unzip build-essential \ bison flex sudo iproute2 pkg-config tcpdump iputils-ping curl bash-completion && \ # Install loxilb's custom ntc tool wget https://github.com/loxilb-io/iproute2/archive/refs/heads/main.zip && \ - unzip main.zip && cd iproute2-main/libbpf/src/ && mkdir build && \ - DESTDIR=build make install && cd - && cd iproute2-main/ && \ + unzip main.zip && cd iproute2-main/ && rm -fr libbpf && wget https://github.com/loxilb-io/libbpf/archive/refs/heads/main.zip && \ + unzip main.zip && mv libbpf-main libbpf && cd libbpf/src/ && mkdir build && \ + make install && DESTDIR=build OBJDIR=build make install && cd - && \ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && \ LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && \ - cp -f tc/tc /usr/local/sbin/ntc && cd - && cd iproute2-main/libbpf/src/ && \ - make install && cd - && rm -fr main.zip iproute2-main && \ + cp -f tc/tc /usr/local/sbin/ntc && cd .. && rm -fr main.zip iproute2-main && \ # Install bpftool git clone --recurse-submodules https://github.com/libbpf/bpftool.git && cd bpftool/src/ && \ git switch --detach v7.2.0 && \ diff --git a/Makefile b/Makefile index bf070e80..793592c2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ docker-cp: build docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o docker cp loxilb-ebpf/kernel/loxilb_dp_debug $(loxilbid):/usr/local/sbin/ - docker cp loxilb-ebpf/libbpf/src/libbpf.so.0.4.0 $(loxilbid):/usr/lib64/ + docker cp loxilb-ebpf/libbpf/src/libbpf.so.0.8.1 $(loxilbid):/usr/lib64/ docker cp loxilb-ebpf/utils/loxilb_dp_tool $(loxilbid):/usr/local/sbin/ docker-cp-ebpf: build @@ -39,7 +39,7 @@ docker-cp-ebpf: build docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o docker cp loxilb-ebpf/kernel/loxilb_dp_debug $(loxilbid):/usr/local/sbin/ - docker cp loxilb-ebpf/libbpf/src/libbpf.so.0.4.0 $(loxilbid):/usr/lib64/ + docker cp loxilb-ebpf/libbpf/src/libbpf.so.0.8.1 $(loxilbid):/usr/lib64/ docker-run: @docker stop $(dock) 2>&1 >> /dev/null || true diff --git a/loxilb-ebpf b/loxilb-ebpf index 2c1db4ce..b79d22ec 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 2c1db4ce4698b9106e9f93d06518fe386329b2b7 +Subproject commit b79d22ecd52e2a0fd77f6dfb298cd3f166f4d41b