Update main

.gitlab/ci/build.yml

@@ -1755,6 +1755,7 @@ basic asan:
   variables:
     TEST_MODE: none
     SAVE_ARTIFACTS: "True"
+    BUILD_ARGS: -DEXIT_TIMEOUT=15
   tags: ["${AMD64_AVX2_TAG}"]
   artifacts:
     <<: *build_artifacts
@@ -1803,6 +1804,36 @@ basic avx512 dpdk:
     <<: *build_artifacts
     expire_in: 3 day
 
+basic avx512 dpdk withassert:
+  extends: .build_and_unit
+  rules:
+    - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+      when: delayed
+      start_in: 2 hours
+  retry: 2
+  interruptible: false
+  variables:
+    OS: ubuntu-24.04
+    COMPILER: gcc
+    BUILD_TYPE: Release
+    TEST_MODE: none
+    ENABLE_UHD: "False"
+    ENABLE_ZEROMQ: "False"
+    ENABLE_DPDK: "True"
+    DPDK_VERSION: "23.11"
+    AUTO_DETECT_ISA: "True"
+    ENABLE_AVX512: "True"
+    ASSERT_LEVEL: NORMAL
+    SAVE_ARTIFACTS: "True"
+    KUBERNETES_CPU_REQUEST: 14
+    KUBERNETES_CPU_LIMIT: 14
+    KUBERNETES_MEMORY_REQUEST: 20Gi
+    KUBERNETES_MEMORY_LIMIT: 20Gi
+  tags: ["${AMD64_VIAVI_BUILDER_TAG}"]
+  artifacts:
+    <<: *build_artifacts
+    expire_in: 3 day
+
 #######
 # Web #
 #######

.gitlab/ci/e2e.yml

@@ -508,6 +508,21 @@ viavi:
       artifacts: true
     - *retina-needs
 
+viavi-debug:
+  stage: rf
+  extends: .e2e-run
+  variables:
+    GROUP: "viavi"
+    TESTBED: "viavi"
+    MARKERS: "viavi_debug"
+    E2E_LOG_LEVEL: "warning"
+    KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
+    RETINA_ARGS: "gnb.all.metrics_enable=True gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.rlc_rb_type=srb"
+  needs:
+    - job: "basic avx512 dpdk withassert"
+      artifacts: true
+    - *retina-needs
+
 ################################################################################
 # Garbage collector
 ################################################################################

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

CHANGELOG

@@ -1,6 +1,12 @@
 Change Log for Releases
 =======================
 
+## 24.04
+ * Allow multiple cells per gNB
+ * Added Intra-gNB handover
+ * Added NTN support for GEO
+ * Other bug-fixes and improved stability and performance in all parts
+
 ## 23.10.1
  * Hotfix that updated the number of downlink threads based on the processing delay for default FDD configurations
 

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -1908,7 +1908,7 @@ static void configure_cli11_ru_ofh_base_cell_args(CLI::App& app, ru_ofh_base_cel
       ->capture_default_str();
   app.add_option("--iq_scaling", config.iq_scaling, "IQ scaling factor")
       ->capture_default_str()
-      ->check(CLI::Range(0.0, 10.0));
+      ->check(CLI::Range(0.0, 20.0));
 
   // Callback function for validating that both compression method and bitwidth parameters were specified.
   auto validate_compression_input = [](CLI::App& cli_app, const std::string& direction) {

cmake/modules/version.cmake

@@ -18,7 +18,7 @@
 # and at http://www.gnu.org/licenses/.
 #
 
-set(SRSRAN_VERSION_MAJOR 23)
-set(SRSRAN_VERSION_MINOR 10)
-set(SRSRAN_VERSION_PATCH 1)
+set(SRSRAN_VERSION_MAJOR 24)
+set(SRSRAN_VERSION_MINOR 04)
+set(SRSRAN_VERSION_PATCH 0)
 set(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")

include/srsran/phy/upper/channel_processors/channel_processor_formatters.h

@@ -28,6 +28,7 @@
 #include "srsran/phy/upper/channel_processors/pdsch_processor.h"
 #include "srsran/phy/upper/channel_processors/prach_detector.h"
 #include "srsran/phy/upper/channel_processors/pucch_processor.h"
+#include "srsran/phy/upper/channel_processors/pusch/formatters.h"
 #include "srsran/phy/upper/channel_processors/ssb_processor.h"
 #include "srsran/ran/pdcch/pdcch_context_formatter.h"
 #include "srsran/ran/pdsch/pdsch_context_formatter.h"
@@ -487,20 +488,7 @@ struct formatter<srsran::pucch_processor_result> {
       helper.format_if_verbose(ctx, "detection_metric={:.1f}", result.detection_metric.value());
     }
 
-    // Extract SINR. It could be it is not available.
-    srsran::optional<float> sinr_dB = result.csi.get_sinr_dB();
-
-    // Channel State Information.
-    helper.format_if_verbose(ctx, "epre={:+.1f}dB", result.csi.get_epre_dB());
-    helper.format_if_verbose(ctx, "rsrp={:+.1f}dB", result.csi.get_rsrp_dB());
-    if (sinr_dB.has_value()) {
-      helper.format_if_verbose(ctx, "sinr={:+.1f}dB", sinr_dB.value());
-    } else {
-      // SINR is not available.
-      helper.format_if_verbose(ctx, "sinr=na");
-    }
-    helper.format_if_verbose(ctx, "t_align={:.1f}us", result.csi.get_time_alignment().to_seconds() * 1e6);
-
+    helper.format_if_verbose(ctx, result.csi);
     return ctx.out();
   }
 };

include/srsran/phy/upper/channel_processors/pusch/formatters.h

@@ -243,9 +243,33 @@ struct formatter<srsran::channel_state_information> {
         helper.format_if_verbose(ctx, "evm={:.2f}", csi.evm.value());
       }
 
-      helper.format_if_verbose(ctx, "epre={:+.1f}dB", csi.get_epre_dB());
-      helper.format_if_verbose(ctx, "rsrp={:+.1f}dB", csi.get_rsrp_dB());
-      helper.format_if_verbose(ctx, "t_align={:.1f}us", csi.get_time_alignment().to_seconds() * 1e6);
+      // Extract CSI measurements. It could be some of them are not available.
+      srsran::optional<float>                 epre_dB       = csi.get_epre_dB();
+      srsran::optional<float>                 rsrp_dB       = csi.get_rsrp_dB();
+      srsran::optional<float>                 sinr_dB       = csi.get_sinr_dB();
+      srsran::optional<srsran::phy_time_unit> time_aligment = csi.get_time_alignment();
+
+      // Print the measurements that are present.
+      if (epre_dB.has_value()) {
+        helper.format_if_verbose(ctx, "epre={:+.1f}dB", epre_dB.value());
+      } else {
+        helper.format_if_verbose(ctx, "epre=na");
+      }
+      if (rsrp_dB.has_value()) {
+        helper.format_if_verbose(ctx, "rsrp={:+.1f}dB", rsrp_dB.value());
+      } else {
+        helper.format_if_verbose(ctx, "rsrp=na");
+      }
+      if (sinr_dB.has_value()) {
+        helper.format_if_verbose(ctx, "sinr={:+.1f}dB", sinr_dB.value());
+      } else {
+        helper.format_if_verbose(ctx, "sinr=na");
+      }
+      if (time_aligment.has_value()) {
+        helper.format_if_verbose(ctx, "t_align={:.2f}us", time_aligment.value().to_seconds() * 1e6);
+      } else {
+        helper.format_if_verbose(ctx, "t_align=na");
+      }
     } else {
       // Short representation only prints the SINR selected for CSI reporting to higher layers.
       srsran::optional<float> sinr_dB = csi.get_sinr_dB();