From c5e1c4f34f445b6672d5db1a2305a15531710302 Mon Sep 17 00:00:00 2001 From: Romain Beurdouche Date: Wed, 28 May 2025 09:56:55 +0000 Subject: [PATCH] feat(CI): Build FHI with K release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the dockerfiles for building DPDK 24.11.4 and xran K release. Signed-off-by: Teodora Vladić --- docker/Dockerfile.base.rhel9 | 4 +++- docker/Dockerfile.build.fhi72.native_arm.ubuntu | 15 ++++++++------- docker/Dockerfile.build.fhi72.rhel9 | 13 +++++++------ docker/Dockerfile.build.fhi72.ubuntu | 15 ++++++++------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9 index 7ed085faf5..d838b038f9 100644 --- a/docker/Dockerfile.base.rhel9 +++ b/docker/Dockerfile.base.rhel9 @@ -45,7 +45,9 @@ RUN rm -f /etc/rhsm-host && \ gcc-toolset-13-gcc-c++ \ # python3-pip and pyyaml are used for conf template generation python3-pip && \ - pip3 install --ignore-installed pyyaml && \ + pip3 install --ignore-installed \ + pyyaml \ + pyelftools && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf diff --git a/docker/Dockerfile.build.fhi72.native_arm.ubuntu b/docker/Dockerfile.build.fhi72.native_arm.ubuntu index 8aa77c3b33..fea4a3699c 100644 --- a/docker/Dockerfile.build.fhi72.native_arm.ubuntu +++ b/docker/Dockerfile.build.fhi72.native_arm.ubuntu @@ -9,6 +9,7 @@ FROM ran-base:latest AS ran-base +ARG xran_VERSION=11.1.1 ARG E2AP_VERSION=E2AP_V3 ARG KPM_VERSION=KPM_V3_00 ENV DEBIAN_FRONTEND=noninteractive @@ -20,7 +21,8 @@ RUN apt-get update && \ wget \ xz-utils \ pkg-config \ - libnuma-dev && \ + libnuma-dev \ + python3-pyelftools && \ rm -rf /var/lib/apt/lists/* RUN rm -Rf /oai-ran @@ -28,9 +30,9 @@ WORKDIR /oai-ran COPY . . ## Download and build DPDK -RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ - tar -xvf dpdk-20.11.9.tar.xz && \ - cd dpdk-stable-20.11.9 && \ +RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-24.11.4.tar.xz && \ + tar -xf dpdk-24.11.4.tar.xz && \ + cd dpdk-stable-24.11.4 && \ meson setup -Dmachine=default build && \ ninja -C build && \ ninja install -C build @@ -38,10 +40,9 @@ RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ ## Build Fronthaul library RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ cd /opt/phy && \ - git checkout oran_f_release_v1.0 &&\ - git apply /oai-ran/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch && \ + git checkout $xran_VERSION &&\ cd /opt/phy/fhi_lib/lib && \ - TARGET=armv8 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 + TARGET=armv8 WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 ## Build Arm RAN Acceleration Library RUN git clone https://git.gitlab.arm.com/networking/ral.git /opt/ral && \ diff --git a/docker/Dockerfile.build.fhi72.rhel9 b/docker/Dockerfile.build.fhi72.rhel9 index 315d1367bb..ec26015da2 100644 --- a/docker/Dockerfile.build.fhi72.rhel9 +++ b/docker/Dockerfile.build.fhi72.rhel9 @@ -14,10 +14,12 @@ RUN rm -Rf /oai-ran WORKDIR /oai-ran COPY . . +ARG xran_VERSION=11.1.1 + ## Download and build DPDK -RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ - tar -xvf dpdk-20.11.9.tar.xz && \ - cd dpdk-stable-20.11.9 && \ +RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-24.11.4.tar.xz && \ + tar -xf dpdk-24.11.4.tar.xz && \ + cd dpdk-stable-24.11.4 && \ meson build && \ ninja -C build && \ ninja install -C build @@ -25,10 +27,9 @@ RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ ## Build Fronthaul library RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ cd /opt/phy && \ - git checkout oran_f_release_v1.0 &&\ - git apply /oai-ran/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch && \ + git checkout $xran_VERSION &&\ cd /opt/phy/fhi_lib/lib && \ - WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 + WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 FROM ran-base AS ran-build-fhi72 ARG E2AP_VERSION=E2AP_V3 diff --git a/docker/Dockerfile.build.fhi72.ubuntu b/docker/Dockerfile.build.fhi72.ubuntu index 3375be7ff7..d9149171fb 100644 --- a/docker/Dockerfile.build.fhi72.ubuntu +++ b/docker/Dockerfile.build.fhi72.ubuntu @@ -9,6 +9,7 @@ FROM ran-base:latest AS ran-base +ARG xran_VERSION=11.1.1 ARG E2AP_VERSION=E2AP_V3 ARG KPM_VERSION=KPM_V3_00 ENV DEBIAN_FRONTEND=noninteractive @@ -20,7 +21,8 @@ RUN apt-get update && \ wget \ xz-utils \ pkg-config \ - libnuma-dev && \ + libnuma-dev \ + python3-pyelftools && \ rm -rf /var/lib/apt/lists/* RUN rm -Rf /oai-ran @@ -28,9 +30,9 @@ WORKDIR /oai-ran COPY . . ## Download and build DPDK -RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ - tar -xvf dpdk-20.11.9.tar.xz && \ - cd dpdk-stable-20.11.9 && \ +RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-24.11.4.tar.xz && \ + tar -xf dpdk-24.11.4.tar.xz && \ + cd dpdk-stable-24.11.4 && \ meson build && \ ninja -C build && \ ninja install -C build @@ -38,10 +40,9 @@ RUN wget http://fast.dpdk.org/rel/dpdk-20.11.9.tar.xz && \ ## Build Fronthaul library RUN git clone https://github.com/openairinterface/o-du-phy.git /opt/phy && \ cd /opt/phy && \ - git checkout oran_f_release_v1.0 &&\ - git apply /oai-ran/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch && \ + git checkout $xran_VERSION &&\ cd /opt/phy/fhi_lib/lib && \ - WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 + WIRELESS_SDK_TOOLCHAIN=gcc RTE_SDK=/oai-ran/dpdk-stable-24.11.4/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 FROM ran-base AS ran-build-fhi72 ## Build and install OAI