Update main

# Conflicts:
#	CMakeLists.txt
#	README.md
#	lib/rlc/rlc_metrics_aggregator.cpp
#	lib/rlc/rlc_metrics_aggregator.h

Author: codebot

.gitlab-ci.yml

@@ -391,7 +391,7 @@ full-code-format:
       export CXX=/usr/bin/clang++
       mkdir -p build
       cd build || exit
-      cmake -DASSERT_LEVEL=PARANOID -DMARCH=x86-64-v3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTS=False ..
+      cmake -DASSERT_LEVEL=PARANOID -DMARCH=x86-64-v3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_TESTING=False ..
       make srsran_versioning # needed to generate hashes.h
     - |
       monitor_child_process() {

.gitlab/ci-shared/build.yml

@@ -100,7 +100,7 @@ variables:
         fi
       done
       if [[ $TEST_MODE = "none" ]]; then
-        BUILD_ARGS="${BUILD_ARGS} -DBUILD_TESTS=False"
+        BUILD_ARGS="${BUILD_ARGS} -DBUILD_TESTING=False"
       fi
 
       BUILD_CMD="${BUILD_ARGS}"

.gitlab/ci/build.yml

@@ -1982,21 +1982,23 @@ basic ru dummy:
     <<: *build_artifacts
     expire_in: 3 days
 
-basic avx2 dpdk:
+basic avx2 dpdk rtsan:
   extends: .build_and_unit
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
   retry: 2
   interruptible: false
   variables:
     SRS_TARGET: gnb_split_7_2
-    OS: ubuntu-24.04
-    COMPILER: gcc
+    OS: ubuntu-24.04-rtsan
+    COMPILER: clang
     CMAKE_BUILD_TYPE: Release
     TEST_MODE: none
     ENABLE_UHD: "False"
     ENABLE_ZEROMQ: "False"
     ENABLE_DPDK: "True"
+    ENABLE_RTSAN: "True"
+    ENABLE_WERROR: "False"
     DPDK_VERSION: "23.11.1_avx2"
     MARCH: x86-64-v3
     FORCE_DEBUG_INFO: "True"
@@ -2047,7 +2049,8 @@ basic avx512 dpdk withassert:
 basic avx512 dpdk rtsan:
   extends: basic avx512 dpdk
   rules:
-    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+    - if: $CI_DESCRIPTION =~ /Weekly/
   variables:
     OS: ubuntu-24.04-rtsan
     COMPILER: clang

.gitlab/ci/builders.yml

@@ -298,11 +298,12 @@ ubuntu-dpdk-builder arm64:
       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}"
     - |
-      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
+      mkdir -p ${CI_PROJECT_DIR}/${CONTEXT}/lib
+      DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends curl apt-transport-https ca-certificates xz-utils
+      curl --header "PRIVATE-TOKEN: $CODEBOT_TOKEN" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/wls/25.03/libwls.a" -o ${CI_PROJECT_DIR}/${CONTEXT}/lib/libwls.a
+    - cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
+    - mkdir -p $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk
+    - ls -lah $CONTEXT $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk
   needs:
     - builder version
 

.gitlab/ci/builders/debian-rtsan/Dockerfile

@@ -26,6 +26,7 @@ RUN chmod +x /usr/local/bin/install_dependencies.sh /usr/local/bin/builder.sh /u
     python3 -m venv /usr/local/builder_tools && \
     /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
 
+ADD lib /opt/lib
 ADD uhd /opt/uhd
 ADD dpdk /opt/dpdk
 

.gitlab/ci/builders/debian/Dockerfile

@@ -30,6 +30,7 @@ RUN chmod +x /usr/local/bin/install_dependencies.sh /usr/local/bin/builder.sh /u
     python3 -m venv /usr/local/builder_tools && \
     /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
 
+ADD lib /opt/lib
 ADD uhd /opt/uhd
 ADD dpdk /opt/dpdk
 

.gitlab/ci/e2e.yml

@@ -138,7 +138,6 @@ smoke zmq:
     GROUP: uesim
     TESTBED: zmq_uesim
     E2E_LOG_LEVEL: info
-    RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
   needs:
     - job: basic relwithdeb
       artifacts: true
@@ -387,7 +386,6 @@ test mode ru:
     MARKERS: test_mode
     KEYWORDS: test_ru
     E2E_LOG_LEVEL: warning
-    RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
   needs:
     - job: basic ru dummy
       artifacts: true
@@ -431,6 +429,8 @@ test mode ru acc100:
   extends: test mode ru
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
+      when: manual
+      allow_failure: true
   variables:
     TESTBED: test_mode_acc100
     MARKERS: test_mode_acc100
@@ -444,7 +444,6 @@ test mode ue many ues:
     MARKERS: test_mode_many_ues
     KEYWORDS: test_mode_many_ues
     E2E_LOG_LEVEL: warning
-    RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
 
 ################################################################################
 # RF
@@ -549,11 +548,10 @@ android drx:
     MARKERS: viavi
     E2E_LOG_LEVEL: warning
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.rlc_rb_type=srb"
-    RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests Plugin/
   needs:
-    - job: basic avx512 dpdk
+    - job: basic avx512 dpdk rtsan
       artifacts: true
     - *retina-needs
 
@@ -629,17 +627,6 @@ viavi debug:
       artifacts: true
     - *retina-needs
 
-viavi rtsan:
-  extends: .viavi
-  variables:
-    KEYWORDS: rtsan
-  when: manual
-  allow_failure: true
-  needs:
-    - job: basic avx512 dpdk rtsan
-      artifacts: true
-    - *retina-needs
-
 viavi um:
   extends: .viavi
   rules:
@@ -657,6 +644,10 @@ viavi 3h:
       start_in: 1 hour
   variables:
     KEYWORDS: 3h
+  needs:
+    - job: basic avx512 dpdk
+      artifacts: true
+    - *retina-needs
 
 viavi 24h:
   extends: .viavi
@@ -665,6 +656,10 @@ viavi 24h:
     - if: $CI_DESCRIPTION =~ /Weekly/
   variables:
     KEYWORDS: 24h
+  needs:
+    - job: basic avx512 dpdk
+      artifacts: true
+    - *retina-needs
 
 ################################################################################
 # Amari S72
@@ -676,14 +671,13 @@ viavi 24h:
   variables:
     GROUP: rf
     TESTBED: s72_uesim
-    E2E_LOG_LEVEL: info
-    RETINA_LAUNCHER_ARGS: "--retina-pod-timeout 900"
+    E2E_LOG_LEVEL: warning
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
       when: delayed
       start_in: 8 hours # woraround: let zmq-uesim finish first
   needs:
-    - job: basic avx2 dpdk
+    - job: basic avx2 dpdk rtsan
       artifacts: true
     - *retina-needs
 

.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.66.3
+RETINA_VERSION=0.68.2
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 AMARISOFT_S72_NTN_VERSION=2024-12-13
@@ -9,7 +9,7 @@ OPEN5GS_VERSION=2.7.0
 FLEXRIC_VERSION=br-flexric
 NTN_CHANNEL_EMULATOR_VERSION=0.1
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-METRICS_SERVER_VERSION=1.9.4
+METRICS_SERVER_VERSION=1.10.0
 DPDK_VERSION=23.11.1
 ZMQ_HOSTLABEL_0=kubernetes.io/hostname=hp-generic-2
 ZMQ_HOSTLABEL_1=kubernetes.io/hostname=ci-buildmaster

.gitlab/ci/e2e/android_x300.yml

@@ -27,12 +27,11 @@
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
-  host_network: retina.srs.io/secondary-ip
   requirements:
     arch: amd64
     cpu:
-      requests: 12
-      limits: 12
+      requests: 8
+      limits: 8
     memory:
       requests: "20G"
       limits: "20G"
@@ -54,8 +53,8 @@
 - name: open5gs
   type: 5gc
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
-  taints: ["purpose=corenetworks"]
-  host_network: retina.srs.io/secondary-ip
+  labels:
+    - kubernetes.io/hostname=sdr6
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/viavi.yml

@@ -14,8 +14,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 20
-      limits: 20
+      requests: 10
+      limits: 10
     memory:
       requests: "60G"
       limits: "60G"