ci: reorder conf viavi

Author: qarlosalberto

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

.gitlab/ci/e2e/retina_request_test_mode.yml

@@ -23,7 +23,8 @@
       limits: "6G"
   resources:
     - type: zmq
-      nof_ant: 4
+      nof_antennas_dl: 4
+      nof_antennas_ul: 4
   environment:
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:

.gitlab/ci/e2e/retina_request_zmq.yml

@@ -41,7 +41,6 @@
       requests: 1
     memory:
       requests: "8G"
-      limits: "8G"
     ephemeral-storage:
       requests: "15G"
       limits: "15G"

.gitlab/ci/e2e/retina_request_zmq_4x4_mimo.yml

@@ -22,7 +22,8 @@
       limits: "6G"
   resources:
     - type: zmq
-      nof_ant: 4
+      nof_antennas_dl: 4
+      nof_antennas_ul: 4
     - type: license
       model: amarisoft-5g
   shared_files:
@@ -41,13 +42,13 @@
       requests: 1
     memory:
       requests: "8G"
-      limits: "8G"
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
   resources:
     - type: zmq
-      nof_ant: 4
+      nof_antennas_dl: 4
+      nof_antennas_ul: 4
   environment:
     - PATH: ${PATH}:/builds/softwareradiosystems/srsgnb/build/apps/gnb
   shared_files:

tests/e2e/tests/iperf.py

@@ -477,9 +477,9 @@ def test_zmq_smoke(
     ),
 )
 @mark.zmq
-@mark.flaky(
-    reruns=2, only_rerun=["failed to start", "Attach timeout reached", "iperf did not achieve the expected data rate"]
-)
+# @mark.flaky(
+#     reruns=2, only_rerun=["failed to start", "Attach timeout reached", "iperf did not achieve the expected data rate"]
+# )
 # pylint: disable=too-many-arguments
 def test_zmq(
     retina_manager: RetinaTestManager,

tests/e2e/tests/viavi.py

@@ -192,8 +192,22 @@ def _test_viavi(
     """
     retina_data.test_config = {
         "gnb": {
-            "parameters": {"gnb_id": 1, "log_level": "warning", "pcap": False, "max_rb_size": max_rb_size},
-            "templates": {"cell": str(Path(__file__).joinpath("../viavi/config.yml").resolve())},
+            "parameters": {
+                "gnb_id": 1,
+                "log_level": "warning",
+                "pcap": False,
+                "max_rb_size": max_rb_size,
+                "dl_arfcn": 625000,
+                "band": 78,
+                "channel_bandwidth_MHz": 100,
+                "common_scs": 30,
+                "tac": 7,
+                "pci": 1,
+                "nof_antennas_dl": 4,
+                "nof_antennas_ul": 1,
+                "prach_config_index": 159,
+            },
+            "templates": {"extra": str(Path(__file__).joinpath("../viavi/config.yml").resolve())},
         },
     }
     if metrics_server is not None:

tests/e2e/tests/viavi/config.yml

@@ -7,18 +7,10 @@
 #
 
 cell_cfg:
-  dl_arfcn: 625000
-  band: 78
-  channel_bandwidth_MHz: 100
-  common_scs: 30
-  plmn: "{{mcc}}{{mnc}}"
-  tac: 7
-  pci: 1
   sib:
     t301: 2000
     t311: 3000
   prach:
-    prach_config_index: 159
     prach_root_sequence_index: 1
     zero_correlation_zone: 0
     prach_frequency_start: 12
@@ -32,18 +24,13 @@ cell_cfg:
     mcs_table: qam256
     max_alloc_attempts: 8
     max_pdschs_per_slot: 8
-{% if max_rb_size != -1 %}
-    max_rb_size: {{ max_rb_size }}
-{% endif %}
   ul_common:
     max_ul_grants_per_slot: 16
     max_pucchs_per_slot: 14
   pusch:
     mcs_table: qam256
     min_k2: 2
     max_puschs_per_slot: 8
-  nof_antennas_dl: 4
-  nof_antennas_ul: 1
   tdd_ul_dl_cfg:
     nof_dl_symbols: 7
     nof_dl_slots: 7