Update main

# Conflicts:
#	apps/cu/adapters/e2_gateways.h
#	apps/services/e2/e2_appconfig.h
#	apps/services/e2/e2_appconfig_translators.cpp
#	tests/unittests/phy/upper/signal_processors/dmrs_pucch_estimator_test_data.tar.gz

Author: codebot

.gitlab-ci.yml

@@ -87,7 +87,7 @@ pr reminder:
 trigger builder:
   stage: ci
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-builder/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-builder/
       when: never  
     - if: $ON_MR
       changes:
@@ -102,7 +102,7 @@ trigger builder:
 trigger docker:
   stage: ci
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-docker/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-docker/
       when: never  
     - if: $ON_MR
       changes:

.gitlab/ci-shared/e2e.yml

@@ -115,7 +115,9 @@ variables:
       cat $RETINA_CONFIG_ENV >> .gitlab/ci/e2e/.env
     # Modify request to shared the complete folder with the gnb container
     - |
-      yq -i '(.[] | select(.type == "gnb") | .shared_files) += [{"local_path": "../../", "remote_path": env(SRSRANDIR), "is_executable": false}]' ${SRSRANDIR}/.gitlab/ci/e2e/retina_request_${TESTBED}.yml
+      if [ "$CI_JOB_NAME_SLUG" != "smoke-zmq" ]; then
+        yq -i '(.[] | select(.type == "gnb") | .shared_files) += [{"local_path": "../../", "remote_path": env(SRSRANDIR), "is_executable": false}]' ${SRSRANDIR}/.gitlab/ci/e2e/retina_request_${TESTBED}.yml
+      fi
     # Set username for retina
     - |
       cd tests/e2e

.gitlab/ci-shared/plugin.yml

@@ -16,7 +16,7 @@ variables:
   SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
   # srsRAN references
   SRSRANDIR: &srsran_dir ${CI_PROJECT_DIR}/srsgnb
-  SRSRAN_REPO_URL: https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/softwareradiosystems/srsgnb.git
+  SRSRAN_REPO_URL: https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_SHELL_SSH_HOST}/softwareradiosystems/srsgnb.git
 
 ######
 # CI #

.gitlab/ci/build.yml

@@ -229,6 +229,14 @@ variables:
 
 .smoke relwithdeb:
   extends: .build_and_unit
+  script: &smoke_script
+    - |
+      if [[ $CI_MERGE_REQUEST_LABELS != *"ci-no-plugin"* ]]; then
+        git submodule add https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_SHELL_SSH_HOST}/${PLUGIN_REPO}.git ${PLUGIN_PATH}
+      fi
+    - *srs_functions
+    - build_srsgnb
+    - launch_tests
   variables:
     OS: ubuntu-24.04
     COMPILER: gcc
@@ -240,6 +248,8 @@ variables:
 
 .smoke tsan:
   extends: .build_and_unit
+  script:
+    - *smoke_script
   variables:
     OS: ubuntu-24.04
     COMPILER: clang
@@ -275,6 +285,8 @@ variables:
 
 .smoke dpdk:
   extends: .build_and_unit
+  script:
+    - *smoke_script
   variables:
     OS: ubuntu-24.04
     COMPILER: clang
@@ -300,6 +312,8 @@ variables:
 
 .smoke avx512:
   extends: .build_and_unit
+  script:
+    - *smoke_script
   variables:
     OS: ubuntu-24.04
     COMPILER: gcc
@@ -311,6 +325,8 @@ variables:
 
 .smoke arm:
   extends: .build_and_unit
+  script:
+    - *smoke_script
   variables:
     OS: ubuntu-24.04
     COMPILER: gcc
@@ -322,6 +338,8 @@ variables:
 
 .smoke arm neon:
   extends: .build_and_unit
+  script:
+    - *smoke_script
   variables:
     OS: ubuntu-24.04
     COMPILER: gcc
@@ -348,7 +366,7 @@ smoke relwithdeb cached:
   extends: .smoke relwithdeb
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR
   after_script:
@@ -361,7 +379,7 @@ smoke relwithdeb cached:
 smoke split 7.2 cached:
   extends: smoke relwithdeb cached
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR
       changes: &split_changes
@@ -383,7 +401,7 @@ smoke tsan cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
@@ -397,7 +415,7 @@ smoke rhel cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
@@ -411,7 +429,7 @@ smoke archlinux cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
@@ -425,7 +443,7 @@ smoke dpdk cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
@@ -446,7 +464,7 @@ smoke avx512 cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
       changes:
@@ -464,7 +482,7 @@ smoke arm cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
       changes:
@@ -482,7 +500,7 @@ smoke arm neon cached:
   stage: manual
   timeout: 1 hour
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
       changes:
@@ -498,7 +516,7 @@ smoke arm neon cached:
 smoke relwithdeb clean:
   extends: .smoke relwithdeb
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
   after_script:
     - *build_after_script
   artifacts:
@@ -507,7 +525,7 @@ smoke relwithdeb clean:
 smoke split 7.2 clean:
   extends: smoke relwithdeb clean
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       changes:
         <<: *split_changes
   variables:
@@ -524,41 +542,41 @@ smoke split 8 clean:
 smoke tsan clean:
   extends: .smoke tsan
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
 
 smoke rhel clean:
   extends: .smoke rhel
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
 
 smoke archlinux clean:
   extends: .smoke archlinux
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
 
 smoke dpdk clean:
   extends: .smoke dpdk
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
 
 smoke avx512 clean:
   extends: .smoke avx512
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       changes:
         <<: *instruction_set_changes
 
 smoke arm clean:
   extends: .smoke arm
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       changes:
         <<: *instruction_set_changes
 
 smoke arm neon clean:
   extends: .smoke arm neon
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       changes:
         <<: *instruction_set_changes
 
@@ -567,7 +585,7 @@ smoke arm neon clean:
 intermediate commits cached:
   extends: .smoke release
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
       when: never
     - if: $ON_MR
   timeout: 2 hour
@@ -598,7 +616,7 @@ valgrind changed tests:
   allow_failure:
     exit_codes: 124 # timeout command's exit code when the time is reached
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /urgent/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-memcheck/
       when: never
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_APPROVED == "true"
     - if: $ON_MR
@@ -635,7 +653,7 @@ valgrind changed tests:
 intermediate commits clean:
   extends: intermediate commits cached
   rules:
-    - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
+    - if: $CI_MERGE_REQUEST_LABELS =~ /ci-no-cache/
 
 #################
 # Build Nightly #

.gitlab/ci/e2e.yml

@@ -338,7 +338,6 @@ test mode ru tsan:
       artifacts: true
     - *txrx-lib
     - *retina-needs
-  allow_failure: true
 
 test mode ru asan:
   extends: test mode ru

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

apps/cu/cu.cpp

@@ -20,7 +20,6 @@
  *
  */
 
-#include "apps/cu/adapters/e2_gateways.h"
 #include "apps/cu/cu_appconfig_cli11_schema.h"
 #include "apps/services/application_message_banners.h"
 #include "apps/services/application_tracer.h"
@@ -42,6 +41,7 @@
 #include "cu_appconfig_yaml_writer.h"
 #include "srsran/cu_up/cu_up.h"
 #include "srsran/e1ap/gateways/e1_local_connector_factory.h"
+#include "srsran/e2/e2ap_config_translators.h"
 #include "srsran/f1ap/gateways/f1c_network_server_factory.h"
 #include "srsran/f1u/cu_up/split_connector/f1u_split_connector_factory.h"
 #include "srsran/gateways/udp_network_gateway.h"
@@ -142,8 +142,8 @@ static void register_app_logs(const logger_appconfig& log_cfg,
   config_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
 
   auto& metrics_logger = srslog::fetch_basic_logger("METRICS", false);
-  metrics_logger.set_level(log_cfg.metrics_level);
-  metrics_logger.set_hex_dump_max_size(log_cfg.hex_max_size);
+  metrics_logger.set_level(log_cfg.metrics_level.level);
+  metrics_logger.set_hex_dump_max_size(log_cfg.metrics_level.hex_max_size);
 
   // Register units logs.
   cu_cp_app_unit.on_loggers_registration();
@@ -317,10 +317,10 @@ int main(int argc, char** argv)
   io_timer_source time_source{app_timers, *epoll_broker, std::chrono::milliseconds{1}};
 
   // Instantiate E2AP client gateway.
-  std::unique_ptr<e2_connection_client> e2_gw_cu_cp =
-      create_cu_e2_client_gateway(cu_cfg.e2_cfg, *epoll_broker, *cu_cp_dlt_pcaps.e2ap);
-  std::unique_ptr<e2_connection_client> e2_gw_cu_up =
-      create_cu_e2_client_gateway(cu_cfg.e2_cfg, *epoll_broker, *cu_up_dlt_pcaps.e2ap);
+  std::unique_ptr<e2_connection_client> e2_gw_cu_cp = create_e2_gateway_client(generate_e2_client_gateway_config(
+      cu_cp_app_unit->get_cu_cp_unit_config().e2_cfg, *epoll_broker, *cu_cp_dlt_pcaps.e2ap, E2_CP_PPID));
+  std::unique_ptr<e2_connection_client> e2_gw_cu_up = create_e2_gateway_client(generate_e2_client_gateway_config(
+      cu_up_app_unit->get_cu_up_unit_config().e2_cfg, *epoll_broker, *cu_up_dlt_pcaps.e2ap, E2_UP_PPID));
 
   app_services::metrics_notifier_proxy_impl metrics_notifier_forwarder;
 

apps/cu/cu_appconfig.h

@@ -23,7 +23,6 @@
 #pragma once
 
 #include "apps/services/buffer_pool/buffer_pool_appconfig.h"
-#include "apps/services/e2/e2_appconfig.h"
 #include "apps/services/logger/logger_appconfig.h"
 #include "apps/services/worker_manager/worker_manager_appconfig.h"
 #include <string>
@@ -51,25 +50,16 @@ struct cu_f1ap_appconfig {
 struct cu_appconfig {
   /// Default constructor to update the log filename.
   cu_appconfig() { log_cfg.filename = "/tmp/cu.log"; }
-
   /// Loggers configuration.
   logger_appconfig log_cfg;
-
   /// Expert configuration.
   expert_execution_appconfig expert_execution_cfg;
-
   /// NR-U
   srs_cu::cu_nru_appconfig nru_cfg;
-
   /// F1AP
   srs_cu::cu_f1ap_appconfig f1ap_cfg;
-
   /// Buffer pool configuration.
   buffer_pool_appconfig buffer_pool_config;
-
-  /// E2 configuration.
-  e2_appconfig e2_cfg;
-  /// TODO fill in the rest of the configuration
 };
 
 } // namespace srsran

apps/cu/cu_appconfig_validator.cpp

@@ -28,11 +28,5 @@ using namespace srsran;
 
 bool srsran::validate_cu_appconfig(const cu_appconfig& config)
 {
-  if (config.e2_cfg.enable_du_e2) {
-    fmt::print("CU application cannot enable DU E2 agent\n");
-
-    return false;
-  }
-
   return validate_logger_appconfig(config.log_cfg);
 }