Update main

# Conflicts:
#	tests/unittests/phy/upper/channel_processors/prach_detector_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pucch_demodulator_format2_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pucch_processor_format2_test_data.tar.gz

Author: codebot

.gitlab-ci.yml

@@ -129,6 +129,18 @@ helm:
     - job: trigger docker
       artifacts: false
 
+enterprise:
+  stage: ci
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
+      variables:
+        CI_DESCRIPTION: Nightly
+        SRSRAN_COMMIT: $CI_COMMIT_SHA
+        NOTIFY_SLACK: "true"
+  trigger:
+    project: softwareradiosystems/srsran_5g_enterprise
+    branch: main
+
 ################################################################################
 ## Static
 ################################################################################

.gitlab/ci/build.yml

@@ -1851,6 +1851,7 @@ basic avx512 dpdk:
   extends: .build_and_unit
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+    - if: $CI_DESCRIPTION =~ /Weekly/
   retry: 2
   interruptible: false
   variables:

.gitlab/ci/docker.yml

@@ -124,15 +124,15 @@ metrics version check in retina:
   tags:
     - amd64-avx2
   timeout: 2h
-  before_script:
+  before_script: &docker_setup
     - dockerd-entrypoint.sh &
     - |
       while ! ( nc -zv localhost 2376 2>&1 >/dev/null )
       do
           sleep 1
       done
 
-gnb docker compose:
+.gnb docker compose:
   extends: .docker compose
   variables: &build_in_compose_variables
     KUBERNETES_CPU_REQUEST: 6
@@ -149,15 +149,26 @@ gnb docker compose:
           - docker/docker-compose.yml
     - if: $CI_DESCRIPTION =~ /Nightly Build Unit Tests/
       interruptible: false
-  script:
+  before_script:
+    - *docker_setup
     - docker compose -f docker/docker-compose.yml build --build-arg NUM_CORES=${KUBERNETES_CPU_LIMIT} --build-arg LIB=${LIB} --build-arg LIB_VERSION=${LIB_VERSION} gnb
-    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb ${TEST_CMD}"
-  parallel:
-    matrix:
-      - <<: *uhd_params
-        TEST_CMD: gnb amf --no_core=true ru_sdr --device_driver uhd | grep 'Failed to open device with address'
-      - <<: *dpdk_params
-        TEST_CMD: gnb amf --no_core=true hal --eal_args='--help'
+    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb which srscu"
+    - sh -c "docker compose -f docker/docker-compose.yml run --no-deps gnb which srsdu"
+
+gnb docker compose uhd:
+  extends: .gnb docker compose
+  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'"
+
+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'"  
 
 5gc docker compose:
   extends: .docker compose
@@ -296,10 +307,6 @@ grafana server image latest:
       export NAME="srsran-project"
       export VERSION="${SPLIT}_${SUFFIX}"
       export BUILD_ARGS="LIB=${LIB};LIB_VERSION=${LIB_VERSION};MARCH=${MARCH};NUM_CORES=${KUBERNETES_CPU_LIMIT};EXTRA_CMAKE_ARGS=\"${EXTRA_CMAKE_ARGS}\""
-  needs:
-    - job: gnb docker compose
-      optional: true
-      artifacts: false
 
 srsran image split72:
   extends: .srsran image
@@ -338,6 +345,10 @@ srsran image split72:
         MARCH: armv8.2-a+crypto+fp16+dotprod
         TAG: arm64
         PLATFORM: arm64
+  needs:
+    - job: gnb docker compose dpdk
+      optional: true
+      artifacts: false
 
 srsran image split8:
   extends: .srsran image
@@ -366,3 +377,7 @@ srsran image split8:
         MARCH: armv8.2-a+crypto+fp16+dotprod
         TAG: arm64
         PLATFORM: arm64
+  needs:
+    - job: gnb docker compose uhd
+      optional: true
+      artifacts: false

.gitlab/ci/e2e.yml

@@ -580,8 +580,7 @@ android x300:
 ################################################################################
 # VIAVI
 ###############################################################################
-
-viavi:
+.viavi:
   stage: rf
   extends: .e2e-run
   timeout: 8h
@@ -594,6 +593,9 @@ viavi:
     KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
     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"
+
+viavi:
+  extends: .viavi
   needs:
     - job: "basic avx512 dpdk"
       artifacts: true
@@ -608,21 +610,28 @@ viavi:
             # "fading and 32UE",
             "birth-death and 1UE",
             # "birth-death and 32UE",
-            "32UE and experimental",
+            "32UE and experimental and not extended",
+          ]
+
+viavi-extended:
+  extends: .viavi
+  rules:
+    - if: $CI_DESCRIPTION =~ /Weekly/
+  allow_failure: true
+  needs:
+    - job: "basic avx512 dpdk"
+      artifacts: true
+    - *retina-needs
+  parallel:
+    matrix:
+      - KEYWORDS: [
+            "extended",
           ]
 
 viavi-debug:
-  stage: rf
-  extends: .e2e-run
+  extends: .viavi
   variables:
-    GROUP: "viavi"
-    TESTBED: "viavi"
     MARKERS: "viavi_debug"
-    E2E_LOG_LEVEL: "warning"
-    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
-    KUBECONFIG_VAR_NAME_EXTRA: "RETINA_NAMESPACE_KUBECONFIG_EXTRA"
-    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"
   allow_failure: true
   needs:
     - job: "basic avx512 dpdk withassert"

.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.9
+RETINA_VERSION=0.52.13
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

.gitlab/ci/release.yml

@@ -229,6 +229,21 @@ notify branch published:
     SLACK_CHANNEL: $SLACK_CHANNEL_OK
     LEVEL: "ok"
 
+publish maltab:
+  stage: public
+  interruptible: false
+  variables:
+    CI_DESCRIPTION: Release
+    NOTIFY_SLACK: "false"
+  rules:
+    - if: *on_public_push
+    - if: *on_public_release
+  needs:
+    - job: publish main
+  trigger:
+    project: softwareradiosystems/srsgnb_matlab
+    branch: master
+
 ################################################################################
 # Release
 ################################################################################

CMakeLists.txt

@@ -38,11 +38,24 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
 include(version) # sets version information
 
-if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE Release)
-   message(STATUS "Build type not specified: defaulting to Release.")
-endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+# Configure supported build types and default build type
+set(supported_build_types "Release" "RelWithDebInfo" "Debug")
+set(default_build_type "Release")
+
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "Build type not specified, using default: ${default_build_type}")
+  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Select build type" FORCE)
+else()
+  # Check if build type is supported
+  if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST supported_build_types)
+    message(SEND_ERROR "Unsupported build type '${CMAKE_BUILD_TYPE}'. Supported build types: ${supported_build_types}")
+  else()
+    message(STATUS "The build type is ${CMAKE_BUILD_TYPE}")
+  endif()
+endif()
+
+# Add possible values for build type in cmake-gui (drop-down widget, for convenience only)
+set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${supported_build_types})
 
 # Generate CMake to include build information
 configure_file(

apps/cu/cu_appconfig.h

@@ -33,6 +33,7 @@ namespace srs_cu {
 /// NR-U configuration
 struct cu_nru_appconfig {
   std::string bind_addr       = "127.0.10.1"; // Bind address used by the F1-U interface
+  std::string ext_addr        = "auto";       // External address advertised by the F1-U interface
   int         udp_rx_max_msgs = 256; // Max number of UDP packets received by a single syscall on the F1-U interface.
   float       pool_occupancy_threshold = 0.9; // Buffer pool occupancy threshold after which packets are dropped.
 };

apps/cu/cu_appconfig_cli11_schema.cpp

@@ -41,6 +41,8 @@ static void configure_cli11_nru_args(CLI::App& app, srs_cu::cu_nru_appconfig& nr
              nru_cfg.bind_addr,
              "Default local IP address interfaces bind to, unless a specific bind address is specified")
       ->check(CLI::ValidIPV4);
+  app.add_option(
+      "--ext_addr", nru_cfg.ext_addr, "External IP address that is advertised to receive F1-U packets from the DU");
   add_option(app, "--udp_max_rx_msgs", nru_cfg.udp_rx_max_msgs, "Maximum amount of messages RX in a single syscall");
   add_option(app,
              "--pool_threshold",

apps/cu/cu_appconfig_yaml_writer.cpp

@@ -45,6 +45,7 @@ static void fill_cu_appconfig_nru_section(YAML::Node node, const srs_cu::cu_nru_
   YAML::Node nru_node         = cu_up_node["nru"];
   nru_node["udp_max_rx_msgs"] = config.udp_rx_max_msgs;
   nru_node["bind_addr"]       = config.bind_addr;
+  nru_node["ext_addr"]        = config.ext_addr;
 }
 
 void srsran::fill_cu_appconfig_in_yaml_schema(YAML::Node& node, const cu_appconfig& config)