ci: add 2x2 mimo dddsu tests

Author: asaezper

.gitlab/ci/e2e.yml

@@ -18,6 +18,7 @@ variables:
       - "zmq"
       - "zmq_deb"
       - "zmq_single_ue"
+      - "zmq_2x2_mimo"
       - "zmq_4x4_mimo"
       - "zmq_srsue"
       - "zmq_cudu"
@@ -287,6 +288,20 @@ amari 1UE:
     - *txrx-lib
     - *retina-needs
 
+amari 1UE 2x2 mimo:
+  extends: .zmq
+  variables:
+    TESTBED: "zmq_2x2_mimo"
+    MARKERS: "zmq_2x2_mimo"
+    E2E_LOG_LEVEL: "info"
+    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
+  needs:
+    - job: "basic relwithdeb"
+      artifacts: true
+    - *txrx-lib
+    - *retina-needs
+  allow_failure: true
+
 amari 1UE 4x4 mimo:
   extends: .zmq
   variables:

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

.gitlab/ci/e2e/retina_request_zmq_2x2_mimo.yml

@@ -0,0 +1,79 @@
+#
+# Copyright 2013-2024 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_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}
+  nof_ports: 32
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 5
+      limits: 5
+    memory:
+      requests: "26G"
+      limits: "26G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: zmq
+      nof_antennas_dl: 2
+      nof_antennas_ul: 2
+    - type: license
+      model: amarisoft-5g
+  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_1}
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 5
+      limits: 5
+    memory:
+      requests: "26G"
+      limits: "26G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: zmq
+      nof_antennas_dl: 2
+      nof_antennas_ul: 2
+  environment:
+    - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
+  shared_files:
+    - local_path: ${GNB_BINARY_PATH}
+      remote_path: /usr/local/bin/gnb
+      is_executable: true
+
+- name: open5gs
+  type: 5gc
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 1
+      limits: 1
+    memory:
+      requests: "8G"
+      limits: "8G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${RETINA_VERSION}
+  labels: 
+    - ${ZMQ_HOSTLABEL_1}

tests/e2e/pyproject.toml

@@ -34,6 +34,7 @@ markers = [
   "rf_not_crash",
   "reattach",
   "test",
+  "zmq_2x2_mimo",
   "zmq_4x4_mimo",
   "zmq_srsue",
   "test_mode",

tests/e2e/tests/iperf.py

@@ -335,6 +335,59 @@ def test_android_hp(
     )
 
 
+@mark.parametrize(
+    "direction",
+    (param(IPerfDir.BIDIRECTIONAL, id="bidirectional", marks=mark.bidirectional),),
+)
+@mark.parametrize(
+    "protocol",
+    (param(IPerfProto.UDP, id="udp", marks=mark.udp),),
+)
+@mark.parametrize(
+    "band, common_scs, bandwidth",
+    (param(41, 30, 20, id="band:%s-scs:%s-bandwidth:%s"),),
+)
+@mark.zmq_2x2_mimo
+@mark.flaky(reruns=2, only_rerun=["failed to start", "Attach timeout reached", "5GC crashed"])
+# pylint: disable=too-many-arguments
+def test_zmq_2x2_mimo(
+    retina_manager: RetinaTestManager,
+    retina_data: RetinaTestData,
+    ue_32: Tuple[UEStub, ...],
+    fivegc: FiveGCStub,
+    gnb: GNBStub,
+    band: int,
+    common_scs: int,
+    bandwidth: int,
+    protocol: IPerfProto,
+    direction: IPerfDir,
+):
+    """
+    ZMQ 4x4 mimo IPerfs
+    """
+
+    _iperf(
+        retina_manager=retina_manager,
+        retina_data=retina_data,
+        ue_array=ue_32,
+        gnb=gnb,
+        fivegc=fivegc,
+        band=band,
+        common_scs=common_scs,
+        bandwidth=bandwidth,
+        sample_rate=None,
+        iperf_duration=SHORT_DURATION,
+        protocol=protocol,
+        bitrate=MEDIUM_BITRATE,
+        direction=direction,
+        global_timing_advance=-1,
+        time_alignment_calibration=0,
+        always_download_artifacts=False,
+        rx_to_tx_latency=2,
+        enable_dddsu=True,
+    )
+
+
 @mark.parametrize(
     "direction",
     (
@@ -617,6 +670,8 @@ def _iperf(
     common_search_space_enable: bool = False,
     prach_config_index=-1,
     ue_stop_timeout: int = 0,
+    rx_to_tx_latency: int = -1,
+    enable_dddsu: bool = False,
 ):
     wait_before_power_off = 5
 
@@ -633,6 +688,8 @@ def _iperf(
         time_alignment_calibration=time_alignment_calibration,
         common_search_space_enable=common_search_space_enable,
         prach_config_index=prach_config_index,
+        rx_to_tx_latency=rx_to_tx_latency,
+        enable_dddsu=enable_dddsu,
     )
     configure_artifacts(
         retina_data=retina_data,

tests/e2e/tests/steps/configuration.py

@@ -40,6 +40,8 @@ def configure_test_parameters(
     num_cells: int = 1,
     cell_position_offset: Tuple[float, float, float] = (1000, 0, 0),
     enable_security_mode: bool = False,
+    rx_to_tx_latency: int = -1,
+    enable_dddsu: bool = False,
 ):
     """
     Configure test parameters
@@ -58,6 +60,7 @@ def configure_test_parameters(
                 "noise_spd": noise_spd,
                 "num_cells": num_cells,
                 "cell_position_offset": cell_position_offset,
+                "rx_to_tx_latency": rx_to_tx_latency,
             },
         },
         "gnb": {
@@ -73,6 +76,7 @@ def configure_test_parameters(
                 "enable_qos_reestablishment": enable_qos_reestablishment,
                 "num_cells": num_cells,
                 "enable_security_mode": enable_security_mode,
+                "enable_dddsu": enable_dddsu,
             },
         },
     }