Update main

# Conflicts:
#	include/srsran/e2/e2_cu_factory.h
#	include/srsran/phy/upper/uplink_slot_pdu_repository.h
#	include/srsran/ru/ru_configuration.h
#	lib/cu_cp/task_schedulers/du_task_scheduler.cpp
#	lib/du/du_low/metrics/CMakeLists.txt
#	lib/ofh/transmitter/ofh_uplink_request_handler_task_dispatcher.h
#	lib/phy/upper/uplink_processor_task_dispatcher.h

Author: codebot

.gitlab-ci.yml

@@ -283,6 +283,7 @@ cppcheck:
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
   interruptible: false
+  timeout: 2 hours
   retry: 2
   variables:
     ANALYZER: cppcheck

.gitlab/ci/e2e.yml

@@ -318,6 +318,18 @@ ric:
     TESTBED: "zmq_ric"
     MARKERS: "zmq_ric"
 
+ntn:
+  extends: .zmq
+  variables:
+    TESTBED: "zmq_ntn"
+    MARKERS: "zmq_ntn"
+  needs:
+    - job: "basic relwithdeb"
+      artifacts: true
+    - job: "build amariue ntn zmq driver"
+      artifacts: true
+    - *retina-needs
+
 ################################################################################
 # TEST MODE
 ################################################################################
@@ -534,7 +546,7 @@ viavi:
           [
             "ideal and 1UE and not MIMO",
             "ideal and 1UE and MIMO",
-            "ideal and 32UE and not experimental and not tdd and not extended",
+            "ideal and 32UE and not experimental and not tdd and not extended and not UM",
             "tdd",
             "fading and 1UE and not MIMO",
             "fading and 1UE and MIMO",
@@ -543,6 +555,17 @@ viavi:
             "32UE and experimental and not extended",
           ]
 
+viavi-um:
+  extends: .viavi
+  rules:
+    - if: $CI_DESCRIPTION =~ /Weekly/
+  variables:
+    KEYWORDS: "ideal and UM"
+  needs:
+    - job: "basic avx512 dpdk"
+      artifacts: true
+    - *retina-needs
+
 viavi-extended:
   extends: .viavi
   rules:

.gitlab/ci/e2e/.env

@@ -1,13 +1,15 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.62.9
+RETINA_VERSION=0.64.0
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
+AMARISOFT_NTN_VERSION=2024-12-13
 SRSUE_VERSION=23.11
 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.8.0
+METRICS_SERVER_VERSION=1.9.3
 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/retina_request_zmq_ntn.yml

@@ -0,0 +1,94 @@
+#
+# 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_NTN_VERSION}_${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL_0}
+  nof_ports: 64
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 4
+      limits: 4
+    memory:
+      requests: "8G"
+      limits: "8G"
+    ephemeral-storage:
+      requests: "8G"
+      limits: "8G"
+  resources:
+    - type: zmq
+    - type: license
+      model: amarisoft-5g-ext
+  shared_files:
+    - local_path: ${AMARISOFT_TXRX_BINARY_PATH}
+      remote_path: /opt/lteue/trx_srsran.so
+      is_executable: true
+
+- name: srs-gnb
+  type: gnb
+  image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL_0}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 4
+      limits: 4
+    memory:
+      requests: "8G"
+      limits: "8G"
+    ephemeral-storage:
+      requests: "8G"
+      limits: "8G"
+  resources:
+    - type: zmq
+  environment:
+    - 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: ntn-channel-emulator
+  type: channel-emulator
+  image: ${RETINA_REGISTRY_PREFIX}/ntn-channel-emulator:${NTN_CHANNEL_EMULATOR_VERSION}_${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL_0}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+      limits: 1
+    memory:
+      requests: "4G"
+      limits: "4G"
+    ephemeral-storage:
+      requests: "4G"
+      limits: "4G"
+  resources:
+    - type: zmq
+
+- name: open5gs
+  type: 5gc
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+      limits: 1
+    memory:
+      requests: "4G"
+      limits: "4G"
+    ephemeral-storage:
+      requests: "4G"
+      limits: "4G"
+  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels:
+    - ${ZMQ_HOSTLABEL_0}

.gitlab/ci/release.yml

@@ -557,7 +557,7 @@ srsran image:
       optional: false
       artifacts: true
 
-notify schedule failed:
+notify release failed:
   extends: .notifier
   rules:
     - if: *on_public_push

.gitlab/ci/trx.yml

@@ -55,7 +55,7 @@ build trx driver:
         mkdir amarisoft
         tar -zxf amarisoft*.tar.gz -C amarisoft
         for file in amarisoft/*/trx_uhd*.tar.gz; do tar -zxf "$file" -C amarisoft/; done
-        mv amarisoft/trx_uhd-linux* amarisoft/trx_uhd-linux
+        mv amarisoft/trx_uhd* amarisoft/trx_uhd-linux
       }
     - |
       build_srsran_trx() {
@@ -106,3 +106,13 @@ build uesim zmq driver:
   artifacts:
     <<: *trx_artifacts
     expire_in: 3 days
+
+build amariue ntn zmq driver:
+  extends: build trx driver
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+  variables:
+    AMARISOFT_VERSION: "2024-12-13"
+  artifacts:
+    <<: *trx_artifacts
+    expire_in: 3 days

apps/cu/CMakeLists.txt

@@ -29,17 +29,18 @@ install(TARGETS srscu
         RUNTIME)
 
 target_link_libraries(srscu PRIVATE
-        srsran_support
-        srsran_versioning
-        srsran_o_cu_cp_app_unit
-        srsran_o_cu_up_app_unit
+        srsran_app_helpers
         srsran_app_services
-        srsran_ngap
-        srsran_f1c_gateway
         srsran_e1_gateway
         srsran_e2
+        srsran_f1c_gateway
         srsran_f1u_cu_up_split_connector
+        srsran_ngap
+        srsran_o_cu_cp_app_unit
+        srsran_o_cu_up_app_unit
         srsran_pcap
+        srsran_support
+        srsran_versioning
         ngap_asn1
 )
 

apps/cu/cu.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "apps/cu/cu_appconfig_cli11_schema.h"
+#include "apps/helpers/f1u/f1u_appconfig.h"
 #include "apps/helpers/metrics/metrics_helpers.h"
 #include "apps/services/app_resource_usage/app_resource_usage.h"
 #include "apps/services/application_message_banners.h"

apps/cu/cu_appconfig.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
+#include "apps/helpers/f1u/f1u_appconfig.h"
+#include "apps/helpers/logger/logger_appconfig.h"
 #include "apps/helpers/metrics/metrics_config.h"
 #include "apps/services/buffer_pool/buffer_pool_appconfig.h"
-#include "apps/services/f1u/f1u_cli11_schema.h"
-#include "apps/services/logger/logger_appconfig.h"
 #include "apps/services/remote_control/remote_control_appconfig.h"
 #include "apps/services/worker_manager/worker_manager_appconfig.h"
 #include <string>

apps/cu/cu_appconfig_cli11_schema.cpp

@@ -21,9 +21,10 @@
  */
 
 #include "cu_appconfig_cli11_schema.h"
+#include "apps/helpers/f1u/f1u_cli11_schema.h"
+#include "apps/helpers/logger/logger_appconfig_cli11_schema.h"
 #include "apps/helpers/metrics/metrics_config_cli11_schema.h"
 #include "apps/services/buffer_pool/buffer_pool_appconfig_cli11_schema.h"
-#include "apps/services/logger/logger_appconfig_cli11_schema.h"
 #include "apps/services/remote_control/remote_control_appconfig_cli11_schema.h"
 #include "apps/services/worker_manager/worker_manager_cli11_schema.h"
 #include "cu_appconfig.h"