ci: improve custom zmq driver job to support all combinations

Author: asaezper

.gitlab/ci-shared/e2e.yml

@@ -3,16 +3,21 @@ variables:
     description: Retina Testbed Description
     options:
       - "zmq"
-      - "zmq_uesim"
       - "zmq_deb"
-      - "zmq_srsue"
       - "zmq_cudu"
       - "zmq_cu2du"
+      - "zmq_srsue"
+      - "zmq_ric"
+      - "zmq_ntn"
+      - "zmq_uesim"
+      - "s72_uesim"
       - "rf_b200"
-      - "rf_hp"
       - "android_b200"
       - "android_x300"
+      - "android_callbox"
       - "viavi"
+      - "test_mode"
+      - "test_mode_acc100"
       - "none"
     value: "zmq"
   E2E_FILE_OR_DIR:

.gitlab/ci/e2e.yml

@@ -78,7 +78,9 @@ custom e2e:
   needs:
     - *retina-needs
     - custom build
-    - build trx driver
+    - job: custom zmq driver
+      artifacts: true
+      optional: true
   interruptible: false # Web jobs are standalone
 
 ################################################################################

.gitlab/ci/trx.yml

@@ -31,8 +31,6 @@ build trx driver:
     - if: $ON_MR == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED == "true" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
       when: never
     - if: $ON_MR
-    - if: $ON_WEB
-    - if: $ON_API
   retry: 2
   script:
     - |
@@ -109,3 +107,19 @@ build amariue ntn zmq driver:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
   variables:
     AMARISOFT_VERSION: "2024-12-13"
+
+custom zmq driver:
+  extends: build trx driver
+  rules:
+    - if: $GROUP == "viavi" || $GROUP == "rf"
+      when: never
+    - if: $GROUP == "uesim"
+      variables:
+        OS: fedora-39
+        AMARISOFT_VERSION: "2024-03-15"
+    - if: $TESTBED == "zmq_ntn"
+      variables:
+        AMARISOFT_VERSION: "2024-12-13"
+    - if: $TESTBED != ""
+      variables:
+        AMARISOFT_VERSION: "2023-09-08"