Update main

# Conflicts: # include/srsran/ran/pci_helpers.h # lib/du/adapters/fapi_factory.cpp # lib/du/adapters/fapi_factory.h # lib/du_high/CMakeLists.txt # lib/du_manager/CMakeLists.txt # lib/du_manager/du_ue/CMakeLists.txt # tests/unittests/cu_cp/cu_cp_inter_cu_handover_test.cpp # tests/unittests/phy/upper/channel_processors/pdsch/pdsch_encoder_test_data.tar.gz # tests/unittests/phy/upper/channel_processors/pdsch/pdsch_modulator_test_data.tar.gz
srsran · Sep 30, 2024 · ee1d86c · ee1d86c
2 parents 2ceb9b6 + ab854aa
commit ee1d86c
Show file tree

Hide file tree

Showing 930 changed files with 15,868 additions and 7,017 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -431,7 +431,7 @@ unit coverage dev:
 pages:
   stage: documentation
   rules:
-    - if: $CI_DESCRIPTION =~ /ightly Build + Unit Tests/
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
       when: always # Even if previous stages/required jobs fail
       allow_failure: true
   image: ${GITLAB_REGISTRY_URI}/${CI_TOOLS_REPO}/doxygen:1.9.8-1.2023.7

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -1825,7 +1825,7 @@ basic asan:
   variables:
     TEST_MODE: none
     MARCH: x86-64-v3
-    BUILD_ARGS: -DEXIT_TIMEOUT=15
+    BUILD_ARGS: -DEXIT_TIMEOUT=60
   tags: ["${AMD64_AVX2_TAG}"]
   after_script:
     - *build_after_script
@@ -1865,7 +1865,7 @@ basic avx512 dpdk:
     DPDK_VERSION: "23.11.1_avx512"
     MARCH: x86-64-v4
     FORCE_DEBUG_INFO: "True"
-    ASSERT_LEVEL: MINIMAL
+    ASSERT_LEVEL: AUTO
   tags: ["${AMD64_AVX512_TAG}"]
   after_script:
     - *build_after_script
@@ -1875,8 +1875,10 @@ basic avx512 dpdk:
 
 basic avx512 dpdk withassert:
   extends: basic avx512 dpdk
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/  
   variables:
-    ASSERT_LEVEL: NORMAL
+    ASSERT_LEVEL: PARANOID
 
 #######
 # Web #

diff --git a/.gitlab/ci/docker.yml b/.gitlab/ci/docker.yml
@@ -160,15 +160,15 @@ gnb docker compose uhd:
   variables:
     <<: *uhd_params
   script:
-    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb gnb amf --no_core=true ru_sdr --device_driver uhd | grep 'Failed to open device with address'"
+    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb gnb cu_cp amf --no_core=true ru_sdr --device_driver uhd | grep 'Failed to open device with address'"
 
 gnb docker compose dpdk:
   extends: .gnb docker compose
   variables:
     <<: *dpdk_params
   script:
     - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb which ru_emulator"
-    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb gnb amf --no_core=true hal --eal_args='--help'"  
+    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb gnb cu_cp amf --no_core=true hal --eal_args='--help'"
 
 5gc docker compose:
   extends: .docker compose

diff --git a/.gitlab/ci/e2e.yml b/.gitlab/ci/e2e.yml
@@ -146,6 +146,7 @@ e2e request and config validation:
   script:
     - |
       # Print E2E parameters
+      echo "GROUP=${GROUP}"
       echo "TESTBED=${TESTBED}"
       echo "MARKERS=${MARKERS}"
       echo "KEYWORDS=${KEYWORDS}"
@@ -555,6 +556,23 @@ android b200:
     GROUP: "rf"
     TESTBED: "android_b200"
     MARKERS: "android"
+    KEYWORDS: "not ims"
+    E2E_LOG_LEVEL: "warning"
+    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
+    KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
+  needs:
+    - job: "basic relwithdeb"
+      artifacts: true
+    - *retina-needs
+
+android IMS:
+  stage: rf
+  extends: .e2e-run
+  variables:
+    GROUP: "rf"
+    TESTBED: "android_callbox"
+    MARKERS: "android"
+    KEYWORDS: "ims"
     E2E_LOG_LEVEL: "warning"
     KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
     KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
@@ -601,7 +619,6 @@ viavi:
     - job: "basic avx512 dpdk"
       artifacts: true
     - *retina-needs
-  allow_failure: true
   parallel:
     matrix:
       - KEYWORDS: [
@@ -618,16 +635,13 @@ viavi-extended:
   extends: .viavi
   rules:
     - if: $CI_DESCRIPTION =~ /Weekly/
+  variables:
+    KEYWORDS: "extended"
   allow_failure: true
   needs:
     - job: "basic avx512 dpdk"
       artifacts: true
     - *retina-needs
-  parallel:
-    matrix:
-      - KEYWORDS: [
-            "extended",
-          ]
 
 viavi-debug:
   extends: .viavi

diff --git a/.gitlab/ci/e2e/.env b/.gitlab/ci/e2e/.env
@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.52.13
+RETINA_VERSION=0.53.0
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11
@@ -9,6 +9,6 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 METRICS_SERVER_VERSION=1.7.3
 DPDK_VERSION=23.11.1
 ZMQ_HOSTLABEL_0=kubernetes.io/hostname=k8s-worker-vm2
-ZMQ_HOSTLABEL_1=kubernetes.io/hostname=skinny-beast
+ZMQ_HOSTLABEL_1=kubernetes.io/hostname=dell-xr12
 AMARISOFT_TXRX_BINARY_PATH=../../build_trx_srsran/libtrx_srsran.so
 GNB_BINARY_PATH=../../build/apps/gnb/gnb
diff --git a/.gitlab/ci/e2e/retina_request_android_callbox.yml b/.gitlab/ci/e2e/retina_request_android_callbox.yml
@@ -0,0 +1,69 @@
+#
+# Copyright 2013-2024 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+- name: android-ue
+  type: ue
+  image: ${RETINA_REGISTRY_PREFIX}/android:${RETINA_VERSION}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+      limits: 1
+    memory:
+      requests: "2G"
+      limits: "2G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: android
+      model: xiaomi-12-lite
+
+- name: srs-gnb
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 12
+      limits: 12
+    memory:
+      requests: "20G"
+      limits: "20G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  taints: ["purpose=manual-testing"]
+  resources:
+    - type: sdr
+      model: x300
+  environment:
+    - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
+  shared_files:
+    - local_path: ${GNB_BINARY_PATH}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
+
+- name: amarisoft-mme
+  type: 5gc
+  image: ${RETINA_REGISTRY_PREFIX}/amarisoft5gc-remote:${RETINA_VERSION}
+  taints: ["purpose=retina"]
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 4
+      limits: 4
+    memory:
+      requests: "4G"
+      limits: "4G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: emulator
+      model: callbox
diff --git a/.gitlab/ci/e2e/retina_request_viavi.yml b/.gitlab/ci/e2e/retina_request_viavi.yml
@@ -9,21 +9,22 @@
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels:
+    - kubernetes.io/hostname=skinny-beast
   requirements:
     arch: amd64
     cpu:
-      requests: 20
-      limits: 20
+      requests: 28
+      limits: 28
     memory:
-      requests: "64G"
-      limits: "64G"
+      requests: "56G"
+      limits: "56G"
     hugepages-1Gi:
-      requests: 4Gi
-      limits: 4Gi
+      requests: 2Gi
+      limits: 2Gi
     ephemeral-storage:
       requests: "50G"
       limits: "50G"
-  taints: ["purpose=ci-amd64-avx512-onprem"]
   resources:
     - type: emulator
       model: viavi

diff --git a/.gitlab/ci/e2e/retina_request_zmq_uesim.yml b/.gitlab/ci/e2e/retina_request_zmq_uesim.yml
@@ -15,8 +15,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 4
-      limits: 4
+      requests: 2
+      limits: 2
     memory:
       requests: "4G"
       limits: "4G"
@@ -41,8 +41,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 20
-      limits: 20
+      requests: 16
+      limits: 16
     memory:
       requests: "48G"
       limits: "48G"
@@ -63,8 +63,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 4
-      limits: 4
+      requests: 2
+      limits: 2
     memory:
       requests: "8G"
       limits: "8G"

diff --git a/.gitlab/ci/release.yml b/.gitlab/ci/release.yml
@@ -111,10 +111,10 @@ generate testvector tar gz:
   interruptible: false
   image: ubuntu:24.04
   script:
-    - find . -name "*.tar.gz" -exec tar -rvf phy_testvectors.tar.gz {} \;
+    - find . -name "*.tar.gz" -exec tar -rvf phy_testvectors.tar {} \;
   artifacts:
     paths:
-      - phy_testvectors.tar.gz
+      - phy_testvectors.tar
     expire_in: "30 days"
 
 coverity-agpl:
@@ -266,7 +266,7 @@ release public:
       artifacts: true
   variables:
     GIT_STRATEGY: none
-    ARTIFACT: phy_testvectors.tar.gz
+    ARTIFACT: phy_testvectors.tar
     PUBLIC_NAME: ""
     PUBLIC_REPO: ""
     PUBLIC_BRANCH: ""
@@ -299,7 +299,7 @@ release public:
         https://api.github.com/repos/${PUBLIC_REPO}/releases \
         -d "{\"tag_name\":\"${PUBLIC_TAG}\",\"target_commitish\":\"${PUBLIC_BRANCH}\",\"name\":\"${PUBLIC_RELEASE_NAME}\",\"body\":\"${PUBLIC_RELEASE_NOTES}\",\"draft\":false,\"prerelease\":false,\"generate_release_notes\":false}" | jq '.id')
 
-    # Push testvector.tar.gz to release
+    # Push ${ARTIFACT} to release
     - |
       curl -L \
         -X POST \

diff --git a/.gitlab/issue_templates/triage.md b/.gitlab/issue_templates/triage.md
@@ -0,0 +1,16 @@
+## Summary
+
+(Summarize the bug encountered concisely)
+
+## Relevant logs and/or screenshots
+
+(Paste any relevant logs - use code blocks (```) to format console output, logs, and code, as
+it's very hard to read otherwise.)
+
+## CI Links
+
+- Add a link to each job that has this failure. Please press `Keep artifacts` to save the job's data as much as possible.
+
+
+/label ~bug::ci ~triage
+/assign @Falkenber9 @supreeth.herle @piotr.gawlowicz
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -357,6 +357,34 @@ message(STATUS "TUNE value is ${MTUNE}")
 # Append march and mtune to the compilation flags.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${MARCH} -mtune=${MTUNE}")
 
+########################################################################
+# DU split setup
+########################################################################
+# Public variable to select the DU split.
+set(DU_SPLIT_TYPE "DYNAMIC" CACHE STRING "DU split type. Default value is 'DYNAMIC'. Allowed values: DYNAMIC, SPLIT_6, SPLIT_7_2, SPLIT_8")
+
+# Internal private booleans to represent the selected DU split type. Values auto-derived from DU_SPLIT_TYPE variable.
+set(DU_SPLIT_DYNAMIC OFF CACHE BOOL "DU dynamic split enabled boolean")
+set(DU_SPLIT_6 OFF CACHE BOOL "DU split 6 enabled boolean")
+set(DU_SPLIT_7_2 OFF CACHE BOOL "DU split 7.2 enabled boolean")
+set(DU_SPLIT_8 OFF CACHE BOOL "DU split 8 enabled boolean")
+
+if (DU_SPLIT_TYPE STREQUAL "DYNAMIC")
+    set(DU_SPLIT_DYNAMIC ON)
+elseif (DU_SPLIT_TYPE STREQUAL "SPLIT_6")
+    set(DU_SPLIT_6 ON)
+elseif (DU_SPLIT_TYPE STREQUAL "SPLIT_7_2")
+    set(DU_SPLIT_7_2 ON)
+elseif (DU_SPLIT_TYPE STREQUAL "SPLIT_8")
+    set(DU_SPLIT_8 ON)
+else ()
+    message(WARNING "DU split value '${DU_SPLIT_TYPE}' is not supported. Defaulting to 'DYNAMIC'")
+    set(DU_SPLIT_TYPE "DYNAMIC")
+    set(DU_SPLIT_DYNAMIC ON)
+endif ()
+
+message(STATUS "Selected DU split is '${DU_SPLIT_TYPE}'")
+
 ########################################################################
 # Compiler launcher setup
 ########################################################################