Update main

# Conflicts:
#	CMakeLists.txt
#	apps/units/cu_cp/logger_registrator.h
#	include/srsran/f1u/f1u_cu_up_entity.h
#	include/srsran/f1u/f1u_cu_up_rx.h
#	include/srsran/f1u/f1u_cu_up_transport.h
#	include/srsran/f1u/f1u_cu_up_tx.h
#	include/srsran/gtpu/gtpu_tunnel_tx.h
#	lib/cu_cp/routine_managers/du_processor_routine_manager.cpp
#	lib/cu_cp/routine_managers/du_processor_routine_manager.h
#	lib/cu_cp/routines/mobility/inter_ngran_node_n2_handover_routine.cpp
#	lib/cu_cp/routines/mobility/inter_ngran_node_n2_handover_routine.h
#	lib/phy/upper/equalization/equalize_zf_2x2.cpp
#	lib/phy/upper/equalization/equalize_zf_2x2.h
#	lib/support/network/epoll_helper.h
#	tests/unittests/cu_cp/du_processor/inter_ngran_node_n2_handover_routine_test.cpp
#	tests/unittests/cu_cp/du_processor/inter_ngran_node_n2_handover_routine_test_helpers.h
#	tests/unittests/phy/upper/channel_processors/pusch/pusch_demodulator_test_data.tar.gz
#	tests/unittests/phy/upper/equalization/channel_equalizer_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/dmrs_pusch_estimator_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.tar.gz

Author: codebot

.gitlab/ci/build.yml

@@ -8,7 +8,7 @@
 
 include:
   - project: softwareradiosystems/ci/srsran_project_packaging
-    ref: "4"
+    ref: "5"
     file: .gitlab/ci-shared/package.yml
   - local: .gitlab/ci/src_cache.yml
 
@@ -27,10 +27,12 @@ variables:
       - amd64
       - amd64-avx2
       - amd64-avx2-avx512
-      - "on-prem-amd64"
-      - "on-prem-arm64"
-      - "aws-spot-amd64"
-      - "aws-spot-arm64"
+      - arm64
+      - on-prem-amd64
+      - on-prem-amd64-avx2-avx512
+      - on-prem-arm64
+      - aws-spot-amd64
+      - aws-spot-arm64
     value: "amd64-avx2"
   OS:
     description: Operating system
@@ -112,6 +114,7 @@ variables:
     ENABLE_TSAN: "" # Empty for cmake default
     ENABLE_GCOV: "" # Empty for cmake default
     ENABLE_WERROR: "" # Empty for cmake default
+    FORCE_DEBUG_INFO: "" # Empty for cmake default
     AUTO_DETECT_ISA: ""
     # CI
     SAVE_ARTIFACTS: "" # Empty by default
@@ -182,6 +185,9 @@ variables:
         if [ -n "${ENABLE_WERROR}" ]; then
           BUILD_CMD="${BUILD_CMD} -DENABLE_WERROR=${ENABLE_WERROR}"
         fi
+        if [ -n "${FORCE_DEBUG_INFO}" ]; then
+          BUILD_CMD="${BUILD_CMD} -DFORCE_DEBUG_INFO=${FORCE_DEBUG_INFO}"
+        fi
         if [[ $TEST_MODE = "none" ]]; then
           BUILD_CMD="${BUILD_CMD} -DBUILD_TESTS=False"
         fi
@@ -1793,6 +1799,7 @@ basic avx512 dpdk:
     DPDK_VERSION: "23.11"
     AUTO_DETECT_ISA: "True"
     ENABLE_AVX512: "True"
+    FORCE_DEBUG_INFO: "True"
     ASSERT_LEVEL: MINIMAL
     SAVE_ARTIFACTS: "True"
     KUBERNETES_CPU_REQUEST: 14
@@ -1823,6 +1830,7 @@ basic avx512 dpdk withassert:
     DPDK_VERSION: "23.11"
     AUTO_DETECT_ISA: "True"
     ENABLE_AVX512: "True"
+    FORCE_DEBUG_INFO: "True"
     ASSERT_LEVEL: NORMAL
     SAVE_ARTIFACTS: "True"
     KUBERNETES_CPU_REQUEST: 14

.gitlab/ci/builders/archlinux/Dockerfile

@@ -28,7 +28,7 @@ ADD builder.sh /usr/local/bin
 RUN chmod +x /usr/local/bin/builder.sh
 
 RUN python -m venv /usr/local/builder_tools
-RUN /usr/local/builder_tools/bin/pip install "pandas<3" "psutil < 6"
+RUN /usr/local/builder_tools/bin/pip install "pandas <3" "psutil < 6"
 ADD changed_tests.py /usr/local/bin
 RUN chmod +x /usr/local/bin/changed_tests.py
 ADD ram_reporter.py /usr/local/bin

.gitlab/ci/docker.yml

@@ -84,7 +84,7 @@ metrics version check in retina:
   stage: compose
   image: docker:24.0.7
   tags:
-    - docker
+    - saas-linux-small-amd64
   timeout: 2h
   variables:
     DOCKER_HOST: tcp://docker:2375/

.gitlab/ci/e2e.yml

@@ -159,6 +159,11 @@ e2e request validation:
       echo "${E2E_CMD}"
       eval $E2E_CMD
   after_script:
+    # Push test metrics
+    - |
+      find . -iname "test_metrics.csv" -exec \
+        influx write --host $INFLUXDB_URL --token $INFLUXDB_TOKEN --org $INFLUXDB_ORG \
+        --bucket ci --file {} \;
     - |
       echo "*******************************************************************************************************************************"
       echo "Test report ---> https://softwareradiosystems.gitlab.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/tests/e2e/log//report.html"
@@ -289,9 +294,15 @@ amari 32UE:
             "iperf and udp and not band:3",
             "iperf and tcp and band:3",
             "iperf and tcp and not band:3",
-            "reestablishment",
           ]
 
+amari 32UE beta:
+  extends: amari 32UE
+  allow_failure: true
+  parallel:
+    matrix:
+      - KEYWORDS: ["reestablishment", "handover"]
+
 amari 32UE asan:
   extends: .zmq
   variables:
@@ -344,16 +355,6 @@ test mode ue:
     - *txrx-lib
     - *retina-needs
 
-test mode ue tsan:
-  extends: test mode ue
-  when: manual
-  allow_failure: true
-  needs:
-    - job: "basic tsan"
-      artifacts: true
-    - *txrx-lib
-    - *retina-needs
-
 test mode ue asan:
   extends: test mode ue
   needs:

.gitlab/ci/e2e/.env

@@ -1,12 +1,12 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.47.1
+RETINA_VERSION=0.48.11
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.7.0
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-METRICS_SERVER_VERSION=1.7.0
+METRICS_SERVER_VERSION=1.7.1
 DPDK_VERSION=23.11
 ZMQ_HOSTLABEL_0=kubernetes.io/hostname=k8s-worker-vm2
 ZMQ_HOSTLABEL_1=kubernetes.io/hostname=k8s-worker-vm2

.gitlab/ci/e2e/retina_request_rf_b200.yml

@@ -9,16 +9,16 @@
 - name: amarisoft-ue
   type: ue
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
-  labels: ["kubernetes.io/hostname=sdr4"]
+  labels: ["kubernetes.io/hostname=hp-oran"]
   nof_ports: 4
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 14
+      limits: 14
     memory:
-      requests: "16G"
-      limits: "16G"
+      requests: "48G"
+      limits: "48G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"

.gitlab/ci/e2e/retina_request_viavi.yml

@@ -13,6 +13,7 @@
     arch: amd64
     cpu:
       requests: 20
+      limits: 20
     memory:
       requests: "64G"
       limits: "64G"

.gitlab/ci/release.yml

@@ -167,7 +167,7 @@ release public:
     # Public tag name: release_X_Y. Ex: release_23_4
     - export PUBLIC_TAG=release_${CI_COMMIT_TAG//./_}
     # Public release name: $PUBLIC_NAME X_Y. Ex: srsRAN Project 23.4
-    - export PUBLIC_RELEASE_NAME=${PUBLIC_NAME} ${CI_COMMIT_TAG}
+    - export PUBLIC_RELEASE_NAME="${PUBLIC_NAME} ${CI_COMMIT_TAG}"
     # Public release notes: tag message
     - export PUBLIC_RELEASE_NOTES=${CI_COMMIT_TAG_MESSAGE}
 

.gitlab/ci/trx.yml

@@ -86,4 +86,4 @@ build amariue zmq driver:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
   artifacts:
     <<: *trx_artifacts
-    expire_in: 1 day
+    expire_in: 3 days

CMakeLists.txt

@@ -70,6 +70,7 @@ option(AUTO_DETECT_ISA       "Enable automatic ISA detection"           ON)
 option(BUILD_TESTS           "Compile tests"                            ON)
 option(ENABLE_GPROF          "Enable gprof"                             OFF)
 option(USE_PHY_TESTVECTORS   "Enable testvector PHY tests"              OFF)
+option(FORCE_DEBUG_INFO      "Add debug information to Release build"   OFF)
 
 # Set assertion level options and default value.
 set(ASSERT_LEVEL "AUTO" CACHE STRING "Assertion paranoia level")
@@ -167,6 +168,10 @@ if (ENABLE_TSAN)
     add_definitions(-DENABLE_TSAN)
 endif (ENABLE_TSAN)
 
+if (FORCE_DEBUG_INFO)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+endif (FORCE_DEBUG_INFO)
+
 if (ENABLE_GCOV)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")