Update main

# Conflicts: # README.md # apps/examples/du/CMakeLists.txt # apps/examples/du/du_example.cpp # apps/examples/du/fapi_factory.cpp # apps/examples/du/fapi_factory.h # apps/examples/du/phy_factory.cpp # apps/examples/du/phy_factory.h # apps/examples/du/radio_notifier_sample.h # apps/services/console_helper.cpp # apps/services/console_helper.h # include/srsran/pdcp/pdcp_tx_pdu.h # include/srsran/support/signal_handler.h # lib/support/signal_handler.cpp
srsran · Jun 17, 2024 · 40b17b4 · 40b17b4
2 parents c33cacb + 480e334
commit 40b17b4
Show file tree

Hide file tree

Showing 508 changed files with 8,449 additions and 4,498 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,16 +25,16 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/features/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/tools/python.yml
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/build.yml
@@ -84,6 +84,7 @@ trigger builder:
           - .gitlab/ci/src_cache.yml
           - .gitlab/ci/builders.yml
           - .gitlab/ci/builders/**/*
+          - docker/scripts/**/*
   trigger:
     include: .gitlab/ci/builders.yml
     strategy: depend
@@ -97,8 +98,13 @@ trigger docker:
           - .gitlab/ci/docker.yml
           - docker/**/*.{yml,env,json,toml,py,sh,csv,py,toml}
           - docker/**/Dockerfile
-          - scripts/srsran_performance
           - .gdbinit
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      variables:
+        CI_DESCRIPTION: $CI_DESCRIPTION
+    - if: $CI_DESCRIPTION =~ /Weekly/
+      variables:
+        CI_DESCRIPTION: $CI_DESCRIPTION
   trigger:
     include: .gitlab/ci/docker.yml
     strategy: depend
@@ -370,7 +376,10 @@ unit coverage:
     expire_in: 10 minutes
   retry: 2
   needs:
-    - job: intermediate commits
+    - job: intermediate commits cached
+      optional: true
+      artifacts: true
+    - job: intermediate commits clean
       optional: true
       artifacts: true
     - job: smoke release update cache
@@ -400,7 +409,7 @@ pages:
     - mv coverage_html public/
     - mv codechecker*html public/
     - mv docs/index.html public/index.html
-    - .gitlab/ci/builders/install_dependencies.sh
+    - docker/scripts/install_dependencies.sh
     - apt-get update && apt-get install -y --no-install-recommends rsync
     - |
       rm -Rf build

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -569,6 +569,8 @@ smoke avx512 cached:
   stage: manual
   timeout: 1 hour
   rules:
+    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+      when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
       changes:
         <<: *instruction_set_changes
@@ -669,9 +671,11 @@ smoke arm neon clean:
 
 # Intermediate commits
 
-intermediate commits:
+intermediate commits cached:
   extends: .smoke release
   rules:
+    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+      when: never
     - if: $ON_MR
   timeout: 1 hour
   variables:
@@ -734,6 +738,13 @@ valgrind changed tests:
     - !reference [.fetch_src_cache, cache]
     - *cache_build_get
 
+intermediate commits clean:
+  extends: intermediate commits cached
+  rules:
+    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+  cache:
+    - !reference [.fetch_src_cache, cache]
+
 #################
 # Build Nightly #
 #################
@@ -1306,7 +1317,7 @@ debian 11 amd64 avx512:
     matrix:
       # ubuntu-20.04 disabled due to https://bugs.launchpad.net/ubuntu/+source/gcc-9/+bug/2029910
       # ubuntu-22.04 disabled due to https://github.com/google/sanitizers/issues/1259#issuecomment-642312392
-      - OS: [ubuntu-24.04, ubuntu-23.10] 
+      - OS: [ubuntu-24.04, ubuntu-23.10]
         SANITIZER: tsan
         COMPILER: [gcc, clang]
         ENABLE_TSAN: "True"
@@ -1348,7 +1359,7 @@ sanitizers amd64 avx512:
     matrix:
       # ubuntu-20.04 disabled due to https://bugs.launchpad.net/ubuntu/+source/gcc-9/+bug/2029910
       # ubuntu-22.04 disabled due to https://github.com/google/sanitizers/issues/1259#issuecomment-642312392
-      - OS: [ubuntu-24.04, ubuntu-23.10] 
+      - OS: [ubuntu-24.04, ubuntu-23.10]
         SANITIZER: tsan
         COMPILER: [gcc, clang]
         ENABLE_TSAN: "True"
@@ -1954,7 +1965,7 @@ basic avx512 dpdk:
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
       when: delayed
-      start_in: 2 hours
+      start_in: 1 hours
   retry: 2
   interruptible: false
   variables:

diff --git a/.gitlab/ci/builders.yml b/.gitlab/ci/builders.yml
@@ -8,13 +8,13 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/tools/docker.yml
   - project: softwareradiosystems/ci/tools
-    ref: "18"
+    ref: "19"
     file: .gitlab/ci-shared/tools/python.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/src_cache.yml
@@ -83,20 +83,8 @@ ubuntu-uhd-builder:
     # Install dependencies and compile
     - |
       build_uhd() {
-        DEBIAN_FRONTEND=noninteractive apt-get update &&  apt-get install -y --no-install-recommends \
-          curl apt-transport-https ca-certificates xz-utils \
-          cmake build-essential pkg-config \
-          libboost-all-dev libusb-1.0-0-dev doxygen \
-          python3-docutils python3-mako python3-numpy python3-setuptools python3-requests
-
-        cd /tmp
-        curl -LJO "https://github.com/EttusResearch/uhd/archive/refs/tags/v${uhd_version}.tar.gz"
-        tar -xf "uhd-${uhd_version}.tar.gz"
-        cd "uhd-${uhd_version}/host" && mkdir -p build && cd build
-        cmake -DENABLE_LIBUHD=On -DCMAKE_INSTALL_PREFIX="/opt/uhd/${uhd_version}" .. || cmake -DENABLE_LIBUHD=On -DCMAKE_INSTALL_PREFIX="/opt/uhd/${uhd_version}" ..
-        make -j${KUBERNETES_CPU_REQUEST}
-        make install
-
+        docker/scripts/install_uhd_dependencies.sh build
+        docker/scripts/build_uhd.sh ${uhd_version} native ${KUBERNETES_CPU_REQUEST}
         mkdir -p ${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd
         cp -r /opt/uhd/${uhd_version} ${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd/${uhd_version}
       }
@@ -176,19 +164,8 @@ ubuntu-dpdk-builder:
     # Install dependencies and compile
     - |
       build_dpdk() {
-        DEBIAN_FRONTEND=noninteractive apt-get update &&  apt-get install -y --no-install-recommends \
-          curl apt-transport-https ca-certificates xz-utils \
-          python3-pip ninja-build g++ git build-essential pkg-config libnuma-dev libfdt-dev pciutils
-        
-        export PIP_EXTRA_INDEX_URL=""
-        pip3 install meson pyelftools || pip3 install --break-system-packages meson pyelftools 
-
-        cd /tmp
-        curl -L "https://fast.dpdk.org/rel/dpdk-${dpdk_version}.tar.xz" | tar -xJ
-        cd dpdk*${dpdk_version}
-        meson build --prefix "/opt/dpdk/${dpdk_version}"
-        ninja -j${KUBERNETES_CPU_REQUEST} -C build install
-
+        docker/scripts/install_dpdk_dependencies.sh build
+        docker/scripts/build_dpdk.sh ${dpdk_version} native ${KUBERNETES_CPU_REQUEST}
         mkdir -p ${CI_PROJECT_DIR}/.gitlab/ci/builders/dpdk
         cp -r /opt/dpdk/${dpdk_version} ${CI_PROJECT_DIR}/.gitlab/ci/builders/dpdk/${dpdk_version}
       }
@@ -255,7 +232,10 @@ ubuntu-dpdk-builder:
       export DOCKERFILE=$CONTEXT/$OS_FAMILY
       export BUILD_ARGS="OS_NAME=${OS_NAME};VERSION=${OS_VERSION};TAG=${VERSION};RHEL_VERSION=${RHEL_CT_VERSION};CR_REGISTRY_URI=${CR_REGISTRY_URI}"
     - |
-      mkdir -p $CONTEXT/uhd $CONTEXT/dpdk  # make sure those jobs that don't need UHD can copy something
+      cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
+      ls -lah $CONTEXT
+    - |
+      mkdir -p $CONTEXT/uhd $CONTEXT/dpdk
       ls -lah $CONTEXT/uhd $CONTEXT/dpdk
   needs:
     - builder version
@@ -311,6 +291,8 @@ image-build-publish [codechecker]:
       export CONTEXT=.gitlab/ci/builders
       export DOCKERFILE=$CONTEXT/codechecker
       export BUILD_ARGS="CR_REGISTRY_URI=${CR_REGISTRY_URI};CI_TOOLS_REPO=${CI_TOOLS_REPO}"
+    - |
+      cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
   needs:
     - builder version
   cache:

diff --git a/.gitlab/ci/builders/version.yml b/.gitlab/ci/builders/version.yml
@@ -20,18 +20,20 @@ builder version:
   script:
     - |
       hash_multiple() {
-        # Create a temporary tar archive of the folder
+        # Create a temporary tar archive of the folders
         temp_archive=$(mktemp)
-        tar -cf "$temp_archive" -C "$@" --mtime='1970-01-01' --sort=name .
+        
+        # Create a tar archive with the provided folders
+        tar -cf "$temp_archive" --directory="${CI_PROJECT_DIR}" --mtime='1970-01-01' --sort=name "$@"
 
         # Generate the hash of the archive using sha256sum
         hash=$(sha256sum "$temp_archive" | cut -c 1-32)
         echo "$hash"
 
         # Clean up the temporary archive
         rm "$temp_archive"
-      } 
-    - DOCKER_BUILDER_VERSION=$(hash_multiple .gitlab/ci/builders)
+      }
+    - DOCKER_BUILDER_VERSION=$(hash_multiple .gitlab/ci/builders docker/scripts)
     - echo "DOCKER_BUILDER_VERSION=$DOCKER_BUILDER_VERSION" >> builder.env
     - echo ${DOCKER_BUILDER_VERSION}
   artifacts: