ci,e2e: adjust retries and pcaps

Author: asaezper

.gitlab/ci/e2e.yml

@@ -273,7 +273,7 @@ amari 32UE:
   variables:
     MARKERS: "zmq and not smoke"
     E2E_LOG_LEVEL: "info"
-    RETINA_ARGS: "gnb.all.pcap=True gnb.all.mac_enable=True gnb.all.rlc_enable=False"
+    RETINA_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False"
   needs:
     - job: "basic relwithdeb"
       artifacts: true

tests/e2e/tests/attach_detach.py

@@ -44,14 +44,14 @@
     ),
 )
 @mark.parametrize(
-    "band, common_scs, bandwidth, always_download_artifacts",
+    "band, common_scs, bandwidth",
     (
-        param(3, 15, 50, True, id="band:%s-scs:%s-bandwidth:%s-artifacts:%s"),
-        param(41, 30, 50, False, id="band:%s-scs:%s-bandwidth:%s-artifacts:%s"),
+        param(3, 15, 50, id="band:%s-scs:%s-bandwidth:%s"),
+        param(41, 30, 50, id="band:%s-scs:%s-bandwidth:%s"),
     ),
 )
 @mark.zmq
-@mark.flaky(reruns=3, only_rerun=["failed to start"])
+@mark.flaky(reruns=3, only_rerun=["failed to start", "IPerf Data Invalid"])
 # pylint: disable=too-many-arguments
 def test_zmq(
     retina_manager: RetinaTestManager,
@@ -62,7 +62,6 @@ def test_zmq(
     band: int,
     common_scs: int,
     bandwidth: int,
-    always_download_artifacts: bool,
     protocol: IPerfProto,
     direction: IPerfDir,
 ):
@@ -86,7 +85,7 @@ def test_zmq(
         direction=direction,
         global_timing_advance=0,
         time_alignment_calibration=0,
-        always_download_artifacts=always_download_artifacts,
+        always_download_artifacts=False,
     )
 
 

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/ping.py

@@ -140,7 +140,7 @@ def test_android_hp(
     ),
 )
 @mark.zmq
-# @mark.flaky(reruns=2, only_rerun=["failed to start", "Attach timeout reached", "Some packages got lost"])
+@mark.flaky(reruns=2, only_rerun=["failed to start", "Attach timeout reached", "Some packages got lost"])
 # pylint: disable=too-many-arguments
 def test_zmq(
     retina_manager: RetinaTestManager,