Update main

# Conflicts:
#	lib/ru/dummy/ru_dummy_rx_prach_buffer.h
#	lib/ru/dummy/ru_dummy_rx_resource_grid.h
#	tests/unittests/phy/upper/channel_processors/prach_detector_test_data.tar.gz

Author: codebot

.gitlab-ci.yml

@@ -162,6 +162,7 @@ validate blocked MRs:
       if [[ -z $TO_VALIDATE_PLUGIN_COMMIT_SHA ]]; then
         TO_VALIDATE_PLUGIN_COMMIT_SHA=$REPO_PLUGIN_COMMIT_SHA
       fi
+      echo "Validating if the related MR is ready, with a successful pipeline and in auto-merge state!"
     - test "$TO_VALIDATE_PLUGIN_COMMIT_SHA" = "$CI_PLUGIN_COMMIT_SHA"
   dependencies:
     - get plugin commit

.gitlab/ci-shared/e2e.yml

@@ -5,12 +5,12 @@ variables:
       - "zmq"
       - "zmq_deb"
       - "zmq_cudu"
-      - "zmq_cu2du"
+      - "zmq_1cu2du"
+      - "zmq_2gnb"
       - "zmq_srsue"
       - "zmq_ric"
       - "zmq_ntn"
-      - "zmq_uesim"
-      - "s72_uesim"
+      - "s72"
       - "rf_b200"
       - "android_b200"
       - "android_x300"
@@ -148,7 +148,7 @@ variables:
       export LOGNAME=ci_${GROUP}
     # Run Retina
     - |
-      E2E_CMD="retina-launcher ${E2E_FILE_OR_DIR} ${RETINA_LAUNCHER_ARGS} --retina-request=${SRSRANDIR}/.gitlab/ci/e2e/${TESTBED}.yml -k '${KEYWORDS}' -m '${MARKERS}' --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL 5gc.all.log_level=$E2E_LOG_LEVEL ${RETINA_PARAM_ARGS}"
+      E2E_CMD="retina-launcher '${E2E_FILE_OR_DIR}' ${RETINA_LAUNCHER_ARGS} --retina-request=${SRSRANDIR}/.gitlab/ci/e2e/${TESTBED}.yml -k '${KEYWORDS}' -m '${MARKERS}' --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL 5gc.all.log_level=$E2E_LOG_LEVEL ${RETINA_PARAM_ARGS}"
       echo "${E2E_CMD}"
       eval $E2E_CMD
   after_script:

.gitlab/ci/build.yml

@@ -1991,7 +1991,7 @@ basic relwithdeb:
   variables:
     SRS_TARGET: srscu srsdu gnb
     OS: ubuntu-24.04
-    COMPILER: gcc
+    COMPILER: clang
     CMAKE_BUILD_TYPE: RelWithDebInfo
     ASSERT_LEVEL: PARANOID
     TEST_MODE: none

.gitlab/ci/e2e.yml

@@ -143,6 +143,12 @@ amari 1UE:
     E2E_LOG_LEVEL: warning
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.enable_integrity_protection=True"
 
+amari 1UE FR2:
+  extends: .zmq
+  variables:
+    MARKERS: "fr2"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
+
 amari 1UE 4x4 mimo:
   extends: .zmq
   variables:
@@ -311,18 +317,29 @@ cudu amari 64UE:
     MARKERS: "zmq and not smoke"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
 
-cu2du amari 8UE:
+1cu2du amari 8UE:
   extends: .zmq
   timeout: 2h
   variables:
-    TESTBED: zmq_cu2du
+    TESTBED: zmq_1cu2du
     MARKERS: "zmq and not smoke"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
   parallel:
     matrix:
       - E2E_FILE_OR_DIR: tests/inter_du_handover.py
         KEYWORDS: sequentially
 
+2gnb amari:
+  extends: .zmq
+  timeout: 2h
+  variables:
+    TESTBED: zmq_2gnb
+    MARKERS: "zmq and not smoke"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
+  parallel:
+    matrix:
+      - E2E_FILE_OR_DIR: tests/inter_cu_handover.py
+
 ric:
   extends: .zmq
   variables:
@@ -463,6 +480,10 @@ test mode ue many ues:
 
 amari b200 asan:
   extends: .rf
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+      when: delayed
+      start_in: 8 hours # let zmq finish first so they don't fight for resources
   variables:
     MARKERS: rf_not_crash
   needs:
@@ -472,6 +493,10 @@ amari b200 asan:
 
 validate b200 config:
   extends: .rf
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+      when: delayed
+      start_in: 8 hours # let zmq finish first so they don't fight for resources
   variables:
     MARKERS: rf_b200
 
@@ -670,12 +695,12 @@ viavi 24h:
   extends: .e2e-run
   variables:
     GROUP: rf
-    TESTBED: s72_uesim
+    TESTBED: s72
     E2E_LOG_LEVEL: warning
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
       when: delayed
-      start_in: 8 hours # woraround: let zmq-uesim finish first
+      start_in: 8 hours # let zmq finish first so they don't fight for resources
   needs:
     - job: basic avx2 dpdk rtsan
       artifacts: true

.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.87.1
+RETINA_VERSION=0.89.4
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2025-09-19
 SRSUE_VERSION=23.11

.gitlab/ci/e2e/rf_b200.yml

@@ -25,7 +25,7 @@
     - type: sdr
       model: b200
     - type: license
-      model: amarisoft-5g
+      model: amarisoft-ue.*
 
 - name: srs-gnb
   type: gnb

.gitlab/ci/e2e/s72_uesim.yml renamed to .gitlab/ci/e2e/s72.yml

@@ -0,0 +1,98 @@
+#
+# Copyright 2013-2025 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: amarisoft-ue
+  type: ue
+  image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL}
+  nof_ports: 64
+  requirements:
+    cpu:
+      requests: 6
+      limits: 6
+    memory:
+      requests: "26G"
+      limits: "26G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: zmq
+    - type: license
+      model: amarisoft-ue.*
+  shared_files:
+    - local_path: ${AMARISOFT_TXRX_BINARY_PATH}
+      remote_path: /opt/lteue/trx_srsran.so
+      is_executable: true
+
+- name: srs-gnb-1
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL}
+  requirements:
+    cpu:
+      requests: 3
+      limits: 3
+    memory:
+      requests: "13G"
+      limits: "13G"
+    ephemeral-storage:
+      requests: "15G"
+      limits: "15G"
+  resources:
+    - type: zmq
+  environment:
+    - RTSAN_OPTIONS: halt_on_error=false:suppress_equal_stacks=true
+    - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
+  shared_files:
+    - local_path: ${GNB_BUILD_PATH}/apps/gnb/gnb
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
+
+- name: srs-gnb-2
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL}
+  requirements:
+    cpu:
+      requests: 3
+      limits: 3
+    memory:
+      requests: "13G"
+      limits: "13G"
+    ephemeral-storage:
+      requests: "15G"
+      limits: "15G"
+  resources:
+    - type: zmq
+  environment:
+    - RTSAN_OPTIONS: halt_on_error=false:suppress_equal_stacks=true
+    - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
+  shared_files:
+    - local_path: ${GNB_BUILD_PATH}/apps/gnb/gnb
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
+
+- name: open5gs
+  type: 5gc
+  requirements:
+    cpu:
+      requests: 2
+      limits: 2
+    memory:
+      requests: "8G"
+      limits: "8G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL}

.gitlab/ci/e2e/zmq_cu2du.yml renamed to .gitlab/ci/e2e/zmq_1cu2du.yml

@@ -1 +1 @@
-d89f9b2cb4dba6509438742223dd6fe714afb677
+69815c84cc798a8889645bf0d1b4ea5c696046af