Update main

Author: codebot

.gitlab/ci/e2e.yml

@@ -110,7 +110,7 @@ e2e request and config validation:
 
 .e2e-run:
   resource_group: e2e-${GROUP}
-  timeout: 6h
+  timeout: 2h
   image:
     name: ${RETINA_REGISTRY_PREFIX}/launcher:${RETINA_VERSION}
     entrypoint: ["/bin/sh", "-c"]
@@ -382,7 +382,6 @@ cudu amari 8UE:
     MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
-  allow_failure: true
   needs:
     - job: "basic relwithdeb"
       artifacts: true
@@ -399,7 +398,6 @@ cudu amari 32UE:
     MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
     RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
-  allow_failure: true
   needs:
     - job: "basic relwithdeb"
       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.51.5
+RETINA_VERSION=0.51.7
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

.gitlab/ci/e2e/retina_request_android_b200.yml

@@ -51,7 +51,7 @@
 - name: open5gs
   type: 5gc
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
-  taints: ["retina"]
+  taints: ["purpose=retina"]
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/retina_request_android_n300.yml

@@ -38,7 +38,7 @@
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
-  taints: ["manual-testing"]
+  taints: ["purpose=manual-testing"]
   resources:
     - type: sdr
       model: n3xx
@@ -52,7 +52,7 @@
 - name: open5gs
   type: 5gc
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
-  taints: ["retina"]
+  taints: ["purpose=retina"]
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/retina_request_android_x300.yml

@@ -38,7 +38,7 @@
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
-  taints: ["manual-testing"]
+  taints: ["purpose=manual-testing"]
   resources:
     - type: sdr
       model: x300
@@ -52,7 +52,7 @@
 - name: open5gs
   type: 5gc
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
-  taints: ["retina"]
+  taints: ["purpose=retina"]
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/retina_request_rf_b200.yml

@@ -56,7 +56,7 @@
 - name: open5gs
   type: 5gc
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
-  taints: ["retina"]
+  taints: ["purpose=retina"]
   requirements:
     arch: amd64
     cpu:

.gitlab/ci/e2e/retina_request_viavi.yml

@@ -23,7 +23,7 @@
     ephemeral-storage:
       requests: "20G"
       limits: "20G"
-  taints: ["ci-amd64-avx512-onprem"]
+  taints: ["purpose=ci-amd64-avx512-onprem"]
   resources:
     - type: emulator
       model: viavi

.gitlab/ci/schedules.yml

@@ -7,7 +7,7 @@
 #
 
 Rebaser:
-  cron: "*/10 6-22 * * 1-5"
+  cron: "*/10 6-21 * * 1-5"
   cron_timezone: "Europe/Madrid"
   ref: refs/heads/dev
   variables:
@@ -39,7 +39,7 @@ Nightly Build Unit Tests:
       raw: false
 
 Nightly E2E Tests:
-  cron: "00 23 * * 0-5"
+  cron: "30 22 * * 0-5"
   cron_timezone: "Europe/Madrid"
   ref: refs/heads/dev
   variables:

apps/cu/cu_appconfig_validator.cpp

@@ -29,4 +29,4 @@ using namespace srsran;
 bool srsran::validate_cu_appconfig(const cu_appconfig& config)
 {
   return validate_logger_appconfig(config.log_cfg);
-}
+}

apps/units/cu_cp/cu_cp_builder.cpp

@@ -35,10 +35,10 @@ cu_cp_unit srsran::build_cu_cp(const cu_cp_unit_config& cu_cp_unit_cfg, cu_cp_bu
   srsran_assert(dependencies.cu_cp_e2_exec, "Invalid E2 executor");
 
   srs_cu_cp::cu_cp_configuration cu_cp_cfg = generate_cu_cp_config(cu_cp_unit_cfg);
-  cu_cp_cfg.cu_cp_executor                 = dependencies.cu_cp_executor;
-  cu_cp_cfg.cu_cp_e2_exec                  = dependencies.cu_cp_e2_exec;
-  cu_cp_cfg.n2_gw                          = dependencies.n2_client;
-  cu_cp_cfg.timers                         = dependencies.timers;
+  cu_cp_cfg.services.cu_cp_executor        = dependencies.cu_cp_executor;
+  cu_cp_cfg.services.cu_cp_e2_exec         = dependencies.cu_cp_e2_exec;
+  cu_cp_cfg.services.n2_gw                 = dependencies.n2_client;
+  cu_cp_cfg.services.timers                = dependencies.timers;
 
   cu_cp_unit cu_cmd_wrapper;
   cu_cmd_wrapper.unit = create_cu_cp(cu_cp_cfg);