From 754c7ce5e8ae3329c5220880372549eb5c033958 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 28 Oct 2025 12:51:40 +0000
Subject: [PATCH] job-specs: Modifications in the coverage jobs

Goal: run the same tests as in iterative but with more combinations of
- frame sizes
- cpus/cores
- scales

The test groups were removed from coverage test sets because they
are not present in the corresponding iterative set.

The test groups were added to coverage test sets because they are
present in the corresponding iterative set.

DPDK
- no changes

TRex
- no changes

VPP
1. 2n-aws
   - no changes, iterative job spec is used
2. 2n-c6in
   - no changes, iterative job spec is used
3. 2n-c7gn
   - no changes, iterative job spec is used
4. 2n-emr
   - removed:
     - ip4-pol
     - ip6-acl
     - loadbalancer
5. 2n-grc
   - removed:
     - ip4-pol
     - ip6-acl
     - loadbalancer
6. 2n-icx
   - removed:
     - ip4-pol
     - ip6-acl
     - loadbalancer
7. 2n-spr
   - removed:
     - ip4-pol
     - ip6-acl
     - loadbalancer
8. 2n-zn2
   - removed:
     - ip4-pol
     - ip6-acl
     - loadbalancer
9. 3n-alt
   - removed:
     - container-memif-sw
     - ip4-acl
     - ip6-acl
     - l2-acl
     - l2-macip
     - vhost-vxlan
   - added:
     - ipsec-sw-async-aes128cbc-hmac512sha
     - ipsec-sw-async-aes128gcm
     - ipsec-sw-async-aes256gcm
     - ipsec-sw
     - ipsec-sw-reassembly
     - ipsec-sw-policy
     - gtpu-sw
     - wireguard-sw
     - gtpu-sw-reassembly
10. 3n-emr
   - removed:
     - container-memif-sw
     - ipsec-sw-policy-aes256gcm
     - ipsec-hw-async-policy-aes256gcm
     - ip4-pol
     - ip4-acl
     - lisp
     - ip6-acl
     - ip6-lisp
     - l2-acl
     - l2-macip
     - vhost
     - vhost-vxlan
   - added:
     - ipsec-sw-reassembly
     - ipsec-sw-udp
     - gtpu-sw
     - gtpu-sw-reassembly
     - wireguard-hw
11. 3n-icx
   - removed:
     - container-memif-sw
     - ipsec-sw-fixtnlip
     - ip4-pol
     - ip4-acl
     - lisp
     - ip6-acl
     - ip6-lisp
     - l2-acl
     - l2-macip
     - vhost
     - vhost-vxlan
   - added:
     - ipsec-sw-reassembly
     - ipsec-sw-udp
     - gtpu-sw-reassembly
12. 3n-icxd
   - removed:
     - ip4-pol
     - ip6-acl
   - added:
     - ipsec-sw-udp
     - ipsec-sw-reassembly
     - ipsec-hw-async-aes256gcm
     - gtpu-sw-reassembly
13. 3n-oct
   - added:
     - ip4 scale
     - l2 scale
14. 3n-snr
   - removed:
     - ip4-pol
     - ip6-acl
   - added:
     - ipsec-sw-reassembly
     - ipsec-sw-udp
     - ipsec-hw-async-aes256gcm
15. 3na-spr
   - removed:
     - container-memif-sw
     - ipsec-sw-fixtnlip
     - ip4-pol
     - ip4-acl
     - lisp
     - ip6-acl
     - ip6-lisp
     - l2-acl
     - l2-macip
     - vhost
     - vhost-vxlan
16. 3nb-spr
   - removed:
     - container-memif-sw
     - ipsec-sw-policy-aes256gcm
     - ipsec-sw-fixtnlip
     - ip4-pol
     - ip4-acl
     - lisp
     - ip6-acl
     - ip6-lisp
     - l2-acl
     - l2-macip
     - vhost
     - vhost-vxlan
   - added:
     - ipsec-sw-reassembly
     - ipsec-sw-udp

Change-Id: I1711809d36deca84b54387b3ecf4f0fcd3bdd558
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/job_specifications/test_groups.yaml      | 141 -----------
 resources/job_specifications/ts_2n-emr.yaml        |  42 +---
 resources/job_specifications/ts_2n-grc.yaml        |  40 +---
 resources/job_specifications/ts_2n-icx.yaml        |  79 +------
 resources/job_specifications/ts_2n-spr.yaml        |  79 +------
 resources/job_specifications/ts_2n-zn2.yaml        |  57 +----
 resources/job_specifications/ts_3n-alt.yaml        |  91 ++++----
 resources/job_specifications/ts_3n-emr.yaml        | 137 ++---------
 resources/job_specifications/ts_3n-icx.yaml        | 260 ++-------------------
 resources/job_specifications/ts_3n-icxd.yaml       |  54 ++---
 resources/job_specifications/ts_3n-oct.yaml        |   6 +-
 resources/job_specifications/ts_3n-snr.yaml        |  56 +++--
 resources/job_specifications/ts_3na-spr.yaml       | 135 +----------
 resources/job_specifications/ts_3nb-spr.yaml       | 184 ++-------------
 .../python/suite_generator/suite_generator.py      |   4 +-
 15 files changed, 199 insertions(+), 1166 deletions(-)

diff --git a/resources/job_specifications/test_groups.yaml b/resources/job_specifications/test_groups.yaml
index 2bed570b49..6113b28663 100644
--- a/resources/job_specifications/test_groups.yaml
+++ b/resources/job_specifications/test_groups.yaml
@@ -44,13 +44,10 @@ test-groups:
   container-memif-hw-sm:
     - eth-l2bdbasemaclrn-eth-2memif-dma-1dcr
 ## IPSec SW
-  ipsec-sw-sm:
-    - ethip4ipsec40tnlsw-ip4base-int-aes256gcm
   ipsec-sw-md:
     - ethip4ipsec4tnlsw-ip4base-int-aes256gcm
     - ethip4ipsec40tnlsw-ip4base-int-aes256gcm
     - ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
-    # - ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha
   ipsec-sw-lg:
     - ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha
     - ethip4ipsec4tnlsw-ip4base-int-aes256gcm
@@ -60,30 +57,10 @@ test-groups:
     - ethip4ipsec1000tnlsw-ip4base-int-aes256gcm
     - ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha
     - ethip4ipsec10000tnlsw-ip4base-int-aes256gcm
-  ipsec-sw-udir-xl:
-    - ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-    - ethip4ipsec4tnlsw-ip4base-int-aes128gcm-udir
-    - ethip4ipsec4tnlsw-ip4base-int-aes256gcm-udir
-    - ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-    - ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-udir
-    - ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-udir
-    - ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-udir
-    - ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-udir
-    - ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-udir
   ipsec-sw-policy-md:
     - ethip4ipsec4tnlsw-ip4base-policy-aes256gcm
     - ethip4ipsec10000tnlsw-ip4base-policy-aes256gcm
     - ethip4ipsec10000tnlsw-ip4base-policy-flow-cache-aes256gcm
-  ipsec-sw-policy-xl:
-    - ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir
-    - ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir
-    - ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir
-    - ethip4ipsec1spe-ip4base-policy-outbound-nocrypto
-    - ethip4ipsec100spe-ip4base-policy-outbound-nocrypto
-    - ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto
-    - ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto
-    - ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto
-    - ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto
   ipsec-sw-async-sm:
     - ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm
     - ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm
@@ -95,10 +72,6 @@ test-groups:
     - ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha
     - ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm
     - ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm
-  ipsec-sw-fixtnlip-md:
-    - ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-aes256gcm
-    - ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-dir-aes256gcm
-    - ethip4ipsec1000tnlsw-fixtnlip-ip4base-policy-flow-rss-aes256gcm
   ipsec-sw-udp:
     - ethip4ipsec10000tnlsw-udp-ip4base-int-aes256gcm
     - ethip4ipsec10000tnlsw-udp-ar-ip4base-int-aes128cbc-hmac256sha
@@ -216,9 +189,6 @@ test-groups:
 ## IPv4
   ip4-base-sm:
     - ethip4-ip4base
-  ip4-sm:
-    - ethip4-ip4base
-    - ethip4-ip4scale200k-rnd
   ip4-aws-md:
     - ethip4-ip4base
     - ethip4-ip4scale20k
@@ -227,15 +197,6 @@ test-groups:
     - ethip4-ip4base
     - ethip4-ip4scale20k-rnd
     - ethip4-ip4scale2m-rnd
-  ip4-2-md:
-    - ethip4-ip4base
-    - ethip4-ip4scale20k-rnd
-    - ethip4-ip4scale200k-rnd
-    - ethip4-ip4scale2m-rnd
-  ip4-3-md:
-    - ethip4-ip4base
-    - ethip4-ip4scale2m
-    - ethip4-ip4scale2m-rnd
   ip4-lg:
     - ethip4-ip4base
     - ethip4-ip4scale20k
@@ -247,19 +208,11 @@ test-groups:
   ip4-60k-sm:
     - ethip4-ip4scale60k-rnd
 ## IPv4 ACL
-  ip4-acl-sm:
-    - ethip4udp-ip4base-iacl50sf-10kflows
-    - ethip4udp-ip4base-iacl50sl-10kflows
   ip4-acl-md:
     - ethip4udp-ip4base-iacl50sf-10kflows
     - ethip4udp-ip4base-iacl50sl-10kflows
     - ethip4udp-ip4base-oacl50sf-10kflows
     - ethip4udp-ip4base-oacl50sl-10kflows
-  ip4-acl-2-md:
-    - ethip4udp-ip4base-iacl1sf-10kflows
-    - ethip4udp-ip4base-iacl1sl-10kflows
-    - ethip4udp-ip4base-oacl1sf-10kflows
-    - ethip4udp-ip4base-oacl1sl-10kflows
   ip4-acl-lg:
     - ethip4udp-ip4base-iacl1sf-10kflows
     - ethip4udp-ip4base-iacl1sl-10kflows
@@ -287,25 +240,9 @@ test-groups:
   nat44-ip4base-cps-sm:
     - ethip4tcp-ip4base-h65536-p63-s4128768-cps
     - ethip4udp-ip4base-h65536-p63-s4128768-cps
-  nat44-ip4base-cps-md:
-    - ethip4tcp-ip4base-h65536-p63-s4128768-cps
-    - ethip4udp-ip4base-h1024-p63-s64512-cps
-    - ethip4udp-ip4base-h16384-p63-s1032192-cps
-    - ethip4udp-ip4base-h65536-p63-s4128768-cps
-    - ethip4udp-ip4base-h262144-p63-s16515072-cps
   nat44-ip4base-tput-sm:
     - ethip4tcp-ip4base-h65536-p63-s4128768-tput
     - ethip4udp-ip4base-h65536-p63-s4128768-tput
-  nat44-ip4base-tput-md:
-    - ethip4tcp-ip4base-h65536-p63-s4128768-tput
-    - ethip4udp-ip4base-h1024-p63-s64512-tput
-    - ethip4udp-ip4base-h16384-p63-s1032192-tput
-    - ethip4udp-ip4base-h65536-p63-s4128768-tput
-    - ethip4udp-ip4base-h262144-p63-s16515072-tput
-## IPv4 Tunnels - Lisp
-  lisp-sm:
-    - ethip4lispip4-ip4base
-    - ethip4lispip6-ip4base
 ## IPv4 Tunnels - Geneve
   geneve-md:
     - ethip4--ethip4udpgeneve-1tun-ip4base
@@ -360,28 +297,14 @@ test-groups:
 ## IPv6
   ip6-base-sm:
     - ethip6-ip6base
-  ip6-sm:
-    - ethip6-ip6base
-    - ethip6-ip6scale200k-rnd
   ip6-aws-md:
     - ethip6-ip6base
     - ethip6-ip6scale20k
     - ethip6-ip6scale20k-rnd
-  ip6-2m-sm:
-    - ethip6-ip6scale2m
-    - ethip6-ip6scale2m-rnd
   ip6-md:
     - ethip6-ip6base
     - ethip6-ip6scale20k-rnd
     - ethip6-ip6scale2m-rnd
-  ip6-acl-md:
-    - ethip6-ip6base
-    - ethip6-ip6base-adlalwlistbase
-    - ethip6-ip6base-iacldstbase
-  ip6-scale-md:
-    - ethip6-ip6scale20k
-    - ethip6-ip6scale200k
-    - ethip6-ip6scale2m
   ip6-scale-lg:
     - ethip6-ip6scale20k
     - ethip6-ip6scale20k-rnd
@@ -389,15 +312,7 @@ test-groups:
     - ethip6-ip6scale200k-rnd
     - ethip6-ip6scale2m
     - ethip6-ip6scale2m-rnd
-## IPv6 Tunnels
-  ip6-lisp-sm:
-    - ethip6lispip4-ip6base
-    - ethip6lispip6-ip6base
 ## L2
-  l2-base-sm:
-    - eth-l2patch
-    - eth-l2xcbase
-    - eth-l2bdbasemaclrn
   l2-base-md:
     - eth-l2patch
     - eth-l2xcbase
@@ -407,59 +322,15 @@ test-groups:
     - eth-l2bdscale10kmaclrn
     - eth-l2bdscale100kmaclrn
     - eth-l2bdscale1mmaclrn
-  l2-sm:
-    - eth-l2xcbase
-    - eth-l2bdbasemaclrn
-  l2-md:
-    - eth-l2xcbase
-    - eth-l2bdbasemaclrn
-    - eth-l2bdscale10kmaclrn
-    - eth-l2bdscale100kmaclrn
   l2-lg:
     - eth-l2xcbase
     - eth-l2patch
     - eth-l2bdbasemaclrn
     - dot1q-l2bdbasemaclrn
     - eth-l2bdscale10kmaclrn
-    # - eth-l2bdscale100kmaclrn
     - eth-l2bdscale1mmaclrn
   l2-1lbvpplacp-sm:
     - eth-l2xcbase-1lbvpplacp
-## L2 ACL
-  l2-acl-md:
-    - eth-l2bdbasemaclrn-iacl50sf-10kflows
-    - eth-l2bdbasemaclrn-iacl50sl-10kflows
-    - eth-l2bdbasemaclrn-oacl50sf-10kflows
-    - eth-l2bdbasemaclrn-oacl50sl-10kflows
-  l2-acl-2-md:
-    - eth-l2bdbasemaclrn-iacl1sf-10kflows
-    - eth-l2bdbasemaclrn-iacl1sl-10kflows
-    - eth-l2bdbasemaclrn-oacl1sf-10kflows
-    - eth-l2bdbasemaclrn-oacl1sl-10kflows
-  l2-acl-xl:
-    - eth-l2bdbasemaclrn-iacl1sf-10kflows
-    - eth-l2bdbasemaclrn-iacl1sl-10kflows
-    - eth-l2bdbasemaclrn-iacl10sf-10kflows
-    - eth-l2bdbasemaclrn-iacl10sl-10kflows
-    - eth-l2bdbasemaclrn-iacl50sf-10kflows
-    - eth-l2bdbasemaclrn-iacl50sl-10kflows
-    - eth-l2bdbasemaclrn-oacl1sf-10kflows
-    - eth-l2bdbasemaclrn-oacl1sl-10kflows
-    - eth-l2bdbasemaclrn-oacl10sf-10kflows
-    - eth-l2bdbasemaclrn-oacl10sl-10kflows
-    - eth-l2bdbasemaclrn-oacl50sf-10kflows
-    - eth-l2bdbasemaclrn-oacl50sl-10kflows
-  l2-macip-sm:
-    - eth-l2bdbasemaclrn-macip-iacl1sl-10kflows
-  l2-macip-md:
-    - eth-l2bdbasemaclrn-macip-iacl1sl-10kflows
-    - eth-l2bdbasemaclrn-macip-iacl10sl-10kflows
-    - eth-l2bdbasemaclrn-macip-iacl50sl-10kflows
-## LB
-  lb-md:
-    - ethip4-loadbalancer-l3dsr
-    - ethip4-loadbalancer-maglev
-    - ethip4-loadbalancer-nat4
 ## SRv6
   srv6-lg:
     - ethip6ip6-ip6base-srv6enc1sid
@@ -469,18 +340,11 @@ test-groups:
     - ethip6srhip6-ip6base-srv6proxy-masq
     - ethip6srhip6-ip6base-srv6proxy-stat
 ## VM Vhost
-  vhost-sm:
-    - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-    - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
   vhost-md:
     - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
     - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
     - eth-l2xcbase-eth-2vhostvr1024-1vm
     - eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-  vhost-2-md:
-    - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-    - eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-    - ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4
   vhost-lg:
     - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm
     - eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
@@ -488,11 +352,6 @@ test-groups:
     - eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
     - ethip4-ip4base-eth-2vhostvr1024-1vm
     - ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4
-  vhost-vxlan-sm:
-    - ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm
-    - ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
-  vhost-vxlan-2-sm:
-    - ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc
 ## soak
   soak-memif-sm:
     - eth-l2bdbasemaclrn-eth-2memif-1dcr
diff --git a/resources/job_specifications/ts_2n-emr.yaml b/resources/job_specifications/ts_2n-emr.yaml
index 0ad7c84a6a..7bd717e68f 100644
--- a/resources/job_specifications/ts_2n-emr.yaml
+++ b/resources/job_specifications/ts_2n-emr.yaml
@@ -26,19 +26,6 @@ test-sets:
       - ip4-lg
 
   2n-emr-vpp-cov-ip4-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-emr-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -51,7 +38,7 @@ test-sets:
     tests:
       - ip4-acl-lg
 
-  2n-emr-vpp-cov-ip4-03:
+  2n-emr-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -91,19 +78,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-emr-vpp-cov-ip6-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-emr-vpp-cov-l2-00:
@@ -132,19 +107,6 @@ test-sets:
     tests:
       - l2-scale-md
 
-  2n-emr-vpp-cov-lb-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
   2n-emr-vpp-cov-memif-00:
     infra:
       100ge2p1e810cq:
diff --git a/resources/job_specifications/ts_2n-grc.yaml b/resources/job_specifications/ts_2n-grc.yaml
index aa7cb0e3bf..852747e589 100644
--- a/resources/job_specifications/ts_2n-grc.yaml
+++ b/resources/job_specifications/ts_2n-grc.yaml
@@ -25,18 +25,6 @@ test-sets:
       - ip4-lg
 
   2n-grc-vpp-cov-ip4-01:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-grc-vpp-cov-ip4-02:
     infra:
       200ge2p1cx7veat:
         - mlx5_core
@@ -48,7 +36,7 @@ test-sets:
     tests:
       - ip4-acl-lg
 
-  2n-grc-vpp-cov-ip4-03:
+  2n-grc-vpp-cov-ip4-02:
     infra:
       200ge2p1cx7veat:
         - mlx5_core
@@ -87,18 +75,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-grc-vpp-cov-ip6-01:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-grc-vpp-cov-l2-00:
@@ -125,18 +102,6 @@ test-sets:
     tests:
       - l2-scale-md
 
-  2n-grc-vpp-cov-lb-00:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
   2n-grc-vpp-cov-memif-00:
     infra:
       200ge2p1cx7veat:
@@ -149,7 +114,6 @@ test-sets:
     tests:
       - container-memif-l2bd-sw-sm
       - container-memif-sw-sm
-      - container-memif-hw-sm
 
   2n-grc-vpp-cov-vhost-00:
     infra:
diff --git a/resources/job_specifications/ts_2n-icx.yaml b/resources/job_specifications/ts_2n-icx.yaml
index 37f46ba50a..94e74bc1f6 100644
--- a/resources/job_specifications/ts_2n-icx.yaml
+++ b/resources/job_specifications/ts_2n-icx.yaml
@@ -59,19 +59,6 @@ test-sets:
       - ip4-lg
 
   2n-icx-vpp-cov-ip4-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-icx-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -84,7 +71,7 @@ test-sets:
     tests:
       - ip4-acl-lg
 
-  2n-icx-vpp-cov-ip4-03:
+  2n-icx-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -114,18 +101,6 @@ test-sets:
       - ip4-lg
 
   2n-icx-vpp-cov-ip4-11:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-icx-vpp-cov-ip4-12:
     infra:
       200ge2p1cx7veat:
         - mlx5_core
@@ -160,19 +135,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-icx-vpp-cov-ip6-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-icx-vpp-cov-ip6-10:
@@ -185,18 +148,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-icx-vpp-cov-ip6-11:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-icx-vpp-cov-l2-00:
@@ -249,31 +201,6 @@ test-sets:
     tests:
       - l2-scale-md
 
-  2n-icx-vpp-cov-lb-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
-  2n-icx-vpp-cov-lb-10:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
   2n-icx-vpp-cov-memif-00:
     infra:
       100ge2p1e810cq:
diff --git a/resources/job_specifications/ts_2n-spr.yaml b/resources/job_specifications/ts_2n-spr.yaml
index e6a7404cf8..f06cf4ac52 100644
--- a/resources/job_specifications/ts_2n-spr.yaml
+++ b/resources/job_specifications/ts_2n-spr.yaml
@@ -63,19 +63,6 @@ test-sets:
       - ip4-lg
 
   2n-spr-vpp-cov-ip4-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-spr-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -88,7 +75,7 @@ test-sets:
     tests:
       - ip4-acl-lg
 
-  2n-spr-vpp-cov-ip4-03:
+  2n-spr-vpp-cov-ip4-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -118,18 +105,6 @@ test-sets:
       - ip4-lg
 
   2n-spr-vpp-cov-ip4-11:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  2n-spr-vpp-cov-ip4-12:
     infra:
       200ge2p1cx7veat:
         - mlx5_core
@@ -164,19 +139,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-spr-vpp-cov-ip6-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-spr-vpp-cov-ip6-10:
@@ -189,18 +152,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  2n-spr-vpp-cov-ip6-11:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
+      - ip6-base-sm
       - ip6-scale-lg
 
   2n-spr-vpp-cov-l2-00:
@@ -253,31 +205,6 @@ test-sets:
     tests:
       - l2-scale-md
 
-  2n-spr-vpp-cov-lb-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
-  2n-spr-vpp-cov-lb-10:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
-
   2n-spr-vpp-cov-memif-00:
     infra:
       100ge2p1e810cq:
diff --git a/resources/job_specifications/ts_2n-zn2.yaml b/resources/job_specifications/ts_2n-zn2.yaml
index fb412ebde4..0903b20688 100644
--- a/resources/job_specifications/ts_2n-zn2.yaml
+++ b/resources/job_specifications/ts_2n-zn2.yaml
@@ -13,37 +13,22 @@ test-sets:
 
 
   2n-zn2-vpp-cov-ip4-00:
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-lg:
-          infra:
-            25ge2p1xxv710:
-              - avf
-              - vfio-pci
-      - ip4-3-md:
-          infra:
-            100ge2p1cx556a:
-              - rdma-core
-              - mlx5_core
-
-  2n-zn2-vpp-cov-ip4-01:
     infra:
       25ge2p1xxv710:
         - avf
         - vfio-pci
+      100ge2p1cx556a:
+        - rdma-core
+        - mlx5_core
     framesize:
       - 64
       - 1518: [1, 2]
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-pol-md
+      - ip4-lg
 
-  2n-zn2-vpp-cov-ip4-02:
+  2n-zn2-vpp-cov-ip4-01:
     infra:
       25ge2p1xxv710:
         - avf
@@ -56,7 +41,7 @@ test-sets:
     tests:
       - ip4-acl-lg
 
-  2n-zn2-vpp-cov-ip4-03:
+  2n-zn2-vpp-cov-ip4-02:
     infra:
       25ge2p1xxv710:
         - avf
@@ -92,7 +77,6 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
       - ip6-base-sm:
           infra:
             100ge2p1cx556a:
@@ -104,6 +88,9 @@ test-sets:
       25ge2p1xxv710:
         - avf
         - vfio-pci
+      100ge2p1cx556a:
+        - rdma-core
+        - mlx5_core
     framesize:
       - 78
       - 1518: [1, 2]
@@ -111,17 +98,15 @@ test-sets:
       - imix
     tests:
       - ip6-scale-lg
-      - ip6-2m-sm:
-          infra:
-            100ge2p1cx556a:
-              - rdma-core
-              - mlx5_core
 
   2n-zn2-vpp-cov-l2-00:
     infra:
       25ge2p1xxv710:
         - avf
         - vfio-pci
+      100ge2p1cx556a:
+        - rdma-core
+        - mlx5_core
     framesize:
       - 64
       - 1518: [1, 2]
@@ -129,24 +114,6 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-      - l2-base-sm:
-          infra:
-            100ge2p1cx556a:
-              - rdma-core
-              - mlx5_core
-
-  2n-zn2-vpp-cov-lb-00:
-    infra:
-      25ge2p1xxv710:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lb-md
 
   2n-zn2-vpp-cov-memif-00:
     infra:
diff --git a/resources/job_specifications/ts_3n-alt.yaml b/resources/job_specifications/ts_3n-alt.yaml
index 06baad1d06..366e8e2404 100644
--- a/resources/job_specifications/ts_3n-alt.yaml
+++ b/resources/job_specifications/ts_3n-alt.yaml
@@ -12,43 +12,42 @@ test-sets:
       - dpdk-sm
 
 
-  3n-alt-vpp-cov-ip4-00:
+  3n-alt-vpp-cov-crypto-01:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, imix]
+    core: [2, 3, 4]
     tests:
-      - ip4-lg
+      - ipsec-sw-async-aes128cbc-hmac512sha-md
+      - ipsec-sw-async-aes128gcm-md
+      - ipsec-sw-async-aes256gcm-md
 
-  3n-alt-vpp-cov-ip4-01:
+  3n-alt-vpp-cov-crypto-02:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, imix]
     tests:
-      - ip4-pol-md
+      - ipsec-sw-lg
 
-  3n-alt-vpp-cov-ip4-02:
+  3n-alt-vpp-cov-crypto-03:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, ]
     tests:
-      - ip4-acl-2-md
+      - ipsec-sw-reassembly-sm
 
-  3n-alt-vpp-cov-ip4tun-00:
+  3n-alt-vpp-cov-crypto-04:
+    infra:
+      100ge2p1cx6dx:
+        - mlx5_core
+    framesize: [1518, imix]
+    tests:
+      - ipsec-sw-policy-md
+
+  3n-alt-vpp-cov-ip4-00:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
@@ -58,22 +57,21 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - vxlan-sm
+      - ip4-lg
 
-  3n-alt-vpp-cov-ip6-00:
+  3n-alt-vpp-cov-ip4-01:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
     framesize:
-      - 78
+      - 64
       - 1518: [1, 2]
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-      - ip6-scale-md
+      - ip4-pol-md
 
-  3n-alt-vpp-cov-l2-00:
+  3n-alt-vpp-cov-ip4tun-00:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
@@ -83,23 +81,38 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - l2-base-md
-      - l2-scale-md
+      - vxlan-sm
+
+  3n-alt-vpp-cov-ip4tun-01:
+    infra:
+      100ge2p1cx6dx:
+        - mlx5_core
+    tests:
+      - gtpu-sw-sm:
+          framesize:
+            - 64
+            - 1518: [1, 2]
+            - 9000: [1, ]
+            - imix
+      - wireguard-sw-md:
+          framesize: [1518, imix]
+      - gtpu-sw-reassembly-sm:
+          framesize: [1518, ]
 
-  3n-alt-vpp-cov-l2-01:
+  3n-alt-vpp-cov-ip6-00:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
     framesize:
-      - 64
+      - 78
       - 1518: [1, 2]
       - 9000: [1, ]
       - imix
     tests:
-      - l2-acl-2-md
-      - l2-macip-sm
+      - ip6-base-sm
+      - ip6-scale-lg
 
-  3n-alt-vpp-cov-memif-00:
+  3n-alt-vpp-cov-l2-00:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
@@ -109,7 +122,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-     - container-memif-sw-sm
+      - l2-base-md
+      - l2-scale-md
 
   3n-alt-vpp-cov-srv6-00:
     infra:
@@ -133,8 +147,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
+      - vhost-lg
 
 
   3n-alt-vpp-iterative:
@@ -164,4 +177,4 @@ test-sets:
       - l2-base-md
       - srv6-lg:
           framesize: [78, ]
-      - vhost-2-md
+      - vhost-lg
diff --git a/resources/job_specifications/ts_3n-emr.yaml b/resources/job_specifications/ts_3n-emr.yaml
index 504013f043..d5dbcb5a32 100644
--- a/resources/job_specifications/ts_3n-emr.yaml
+++ b/resources/job_specifications/ts_3n-emr.yaml
@@ -21,7 +21,6 @@ test-sets:
     core: [1, ]
     tests:
       - ipsec-sw-aes128cbc-hmac512sha-lg
-      - ipsec-sw-policy-aes256gcm-sm
 
   3n-emr-vpp-cov-crypto-01:
     infra:
@@ -69,35 +68,25 @@ test-sets:
       - imix
     tests:
       - ipsec-hw-async-aes256gcm-md
-      - ipsec-hw-async-policy-aes256gcm-md
 
-  3n-emr-vpp-cov-ip4-00:
+  3n-emr-vpp-cov-crypto-05:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, ]
     tests:
-      - ip4-2-md
+      - ipsec-sw-reassembly-sm
 
-  3n-emr-vpp-cov-ip4-01:
+  3n-emr-vpp-cov-crypto-06:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
     tests:
-      - ip4-pol-md
+      - ipsec-sw-udp:
+          framesize: [1518, ]
+          core: [1, ]
 
-  3n-emr-vpp-cov-ip4-02:
+  3n-emr-vpp-cov-ip4-00:
     infra:
       100ge2p1e810cq:
         - avf
@@ -108,7 +97,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-acl-lg
+      - ip4-lg
 
   3n-emr-vpp-cov-ip4tun-00:
     infra:
@@ -126,39 +115,35 @@ test-sets:
   3n-emr-vpp-cov-ip4tun-01:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize: [64, 1518, imix]
     tests:
-      - wireguard-sw-lg
+      - gtpu-sw-sm:
+          framesize:
+            - 64
+            - 1518: [1, 2]
+            - 9000: [1, ]
+            - imix
+      - gtpu-sw-reassembly-sm:
+          framesize: [1518, ]
 
   3n-emr-vpp-cov-ip4tun-02:
     infra:
       100ge2p1e810cq:
         - avf
         - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [64, 1518, imix]
     tests:
-      - lisp-sm
+      - wireguard-sw-lg
 
-  3n-emr-vpp-cov-ip6-00:
+  3n-emr-vpp-cov-ip4tun-03:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, imix]
     tests:
-      - ip6-acl-md
+      - wireguard-hw-lg
 
-  3n-emr-vpp-cov-ip6-01:
+  3n-emr-vpp-cov-ip6-00:
     infra:
       100ge2p1e810cq:
         - avf
@@ -169,15 +154,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-scale-md
-
-  3n-emr-vpp-cov-ip6tun-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    tests:
-      - ip6-lisp-sm
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3n-emr-vpp-cov-l2-00:
     infra:
@@ -191,59 +169,8 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3n-emr-vpp-cov-l2-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
-  3n-emr-vpp-cov-l2-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-acl-xl
-
-  3n-emr-vpp-cov-l2-03:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-macip-md
-
-  3n-emr-vpp-cov-memif-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - container-memif-sw-sm
-
   3n-emr-vpp-cov-srv6-00:
     infra:
       100ge2p1e810cq:
@@ -257,20 +184,6 @@ test-sets:
     tests:
       - srv6-lg
 
-  3n-emr-vpp-cov-vhost-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
 
   3n-emr-vpp-iterative:
     infra:
diff --git a/resources/job_specifications/ts_3n-icx.yaml b/resources/job_specifications/ts_3n-icx.yaml
index 0221d3b5d7..e5a6a54924 100644
--- a/resources/job_specifications/ts_3n-icx.yaml
+++ b/resources/job_specifications/ts_3n-icx.yaml
@@ -65,11 +65,20 @@ test-sets:
 
   3n-icx-vpp-cov-crypto-04:
     infra:
-      25ge2p1e810xxv:
+      100ge2p1e810cq:
         - vfio-pci
-    framesize: [64, 1518, imix]
+    framesize: [1518, ]
     tests:
-      - ipsec-sw-fixtnlip-md
+      - ipsec-sw-reassembly-sm
+
+  3n-icx-vpp-cov-crypto-05:
+    infra:
+      100ge2p1e810cq:
+        - vfio-pci
+    tests:
+      - ipsec-sw-udp:
+          framesize: [1518, ]
+          core: [1, ]
 
   3n-icx-vpp-cov-crypto-10:
     infra:
@@ -125,33 +134,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-2-md
-
-  3n-icx-vpp-cov-ip4-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  3n-icx-vpp-cov-ip4-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-acl-lg
+      - ip4-lg
 
   3n-icx-vpp-cov-ip4-10:
     infra:
@@ -163,31 +146,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-2-md
-
-  3n-icx-vpp-cov-ip4-11:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  3n-icx-vpp-cov-ip4-12:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-acl-lg
+      - ip4-lg
 
   3n-icx-vpp-cov-ip4tun-00:
     infra:
@@ -211,19 +170,6 @@ test-sets:
       - wireguard-sw-lg
 
   3n-icx-vpp-cov-ip4tun-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lisp-sm
-
-  3n-icx-vpp-cov-ip4tun-03:
     infra:
       100ge2p1e810cq:
         - vfio-pci
@@ -237,6 +183,8 @@ test-sets:
     tests:
       - gtpu-sw-sm
       - gtpu-hw-sm
+      - gtpu-sw-reassembly-sm:
+          framesize: [1518, ]
 
   3n-icx-vpp-cov-ip4tun-10:
     infra:
@@ -258,18 +206,6 @@ test-sets:
     tests:
       - wireguard-sw-lg
 
-  3n-icx-vpp-cov-ip4tun-12:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lisp-sm
-
   3n-icx-vpp-cov-ip6-00:
     infra:
       100ge2p1e810cq:
@@ -281,20 +217,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  3n-icx-vpp-cov-ip6-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-scale-md
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3n-icx-vpp-cov-ip6-10:
     infra:
@@ -306,44 +230,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  3n-icx-vpp-cov-ip6-11:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-scale-md
-
-  3n-icx-vpp-cov-ip6tun-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-lisp-sm
-
-  3n-icx-vpp-cov-ip6tun-10:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-lisp-sm
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3n-icx-vpp-cov-l2-00:
     infra:
@@ -357,34 +245,9 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3n-icx-vpp-cov-l2-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
-  3n-icx-vpp-cov-l2-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-acl-xl
-
-  3n-icx-vpp-cov-l2-03:
+  3n-icx-vpp-cov-l2-01:
     infra:
       100ge2p1e810cq:
         - avf
@@ -395,7 +258,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - l2-macip-md
+      - l2-1lbvpplacp-sm
 
   3n-icx-vpp-cov-l2-10:
     infra:
@@ -408,57 +271,9 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3n-icx-vpp-cov-l2-11:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
-  3n-icx-vpp-cov-l2-12:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-acl-xl
-
-  3n-icx-vpp-cov-l2-13:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-macip-md
-
-  3n-icx-vpp-cov-memif-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - container-memif-sw-sm
-
-  3n-icx-vpp-cov-memif-10:
+  3n-icx-vpp-cov-l2-11:
     infra:
       100ge2p1cx6dx:
         - mlx5_core
@@ -468,7 +283,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - container-memif-sw-sm
+      - l2-1lbvpplacp-sm
 
   3n-icx-vpp-cov-srv6-00:
     infra:
@@ -495,33 +310,6 @@ test-sets:
     tests:
       - srv6-lg
 
-  3n-icx-vpp-cov-vhost-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
-  3n-icx-vpp-cov-vhost-10:
-    infra:
-      100ge2p1cx6dx:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
 
   3n-icx-vpp-iterative:
     tests:
diff --git a/resources/job_specifications/ts_3n-icxd.yaml b/resources/job_specifications/ts_3n-icxd.yaml
index ccf6dca1d8..36ef1d5b7f 100644
--- a/resources/job_specifications/ts_3n-icxd.yaml
+++ b/resources/job_specifications/ts_3n-icxd.yaml
@@ -37,19 +37,35 @@ test-sets:
       - ipsec-sw-async-aes128gcm-md
       - ipsec-sw-async-aes256gcm-md
 
-  3n-icxd-vpp-cov-ip4-00:
+  3n-icxd-vpp-cov-crypto-02:
+    infra:
+      25ge2p1e823c:
+        - vfio-pci
+    tests:
+      - ipsec-sw-udp:
+          framesize: [1518, ]
+          core: [1, ]
+
+  3n-icxd-vpp-cov-crypto-03:
+    infra:
+      25ge2p1e823c:
+        - vfio-pci
+    framesize: [1518, ]
+    tests:
+      - ipsec-sw-reassembly-sm
+
+  3n-icxd-vpp-cov-crypto-04:
     infra:
       25ge2p1e823c:
         - vfio-pci
     framesize:
       - 64
       - 1518: [1, 2]
-      - 9000: [1, ]
       - imix
     tests:
-      - ip4-lg
+      - ipsec-hw-async-aes256gcm-md
 
-  3n-icxd-vpp-cov-ip4-01:
+  3n-icxd-vpp-cov-ip4-00:
     infra:
       25ge2p1e823c:
         - vfio-pci
@@ -59,7 +75,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-pol-md
+      - ip4-lg
 
   3n-icxd-vpp-cov-ip4tun-00:
     infra:
@@ -77,24 +93,20 @@ test-sets:
     infra:
       25ge2p1e823c:
         - vfio-pci
-    framesize: [64, 1518, imix]
+    framesize: [1518, imix]
     tests:
       - wireguard-sw-lg
       - wireguard-hw-lg
 
-  3n-icxd-vpp-cov-ip6-00:
+  3n-icxd-vpp-cov-ip4tun-02:
     infra:
       25ge2p1e823c:
         - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, ]
     tests:
-      - ip6-acl-md
+      - gtpu-sw-reassembly-sm
 
-  3n-icxd-vpp-cov-ip6-01:
+  3n-icxd-vpp-cov-ip6-00:
     infra:
       25ge2p1e823c:
         - vfio-pci
@@ -104,7 +116,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-scale-md
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3n-icxd-vpp-cov-l2-00:
     infra:
@@ -117,17 +130,6 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3n-icxd-vpp-cov-l2-01:
-    infra:
-      25ge2p1e823c:
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
 
diff --git a/resources/job_specifications/ts_3n-oct.yaml b/resources/job_specifications/ts_3n-oct.yaml
index 533925a407..a6b5996224 100644
--- a/resources/job_specifications/ts_3n-oct.yaml
+++ b/resources/job_specifications/ts_3n-oct.yaml
@@ -14,7 +14,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-aws-md
+      - ip4-lg
 
   3n-oct-vpp-cov-l2-00:
     infra:
@@ -26,7 +26,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - l2-md
+      - l2-lg
 
 
   3n-oct-vpp-iterative:
@@ -35,4 +35,4 @@ test-sets:
         - oct-vfio-pci
     tests:
       - ip4-aws-md
-      - l2-md
+      - l2-lg
diff --git a/resources/job_specifications/ts_3n-snr.yaml b/resources/job_specifications/ts_3n-snr.yaml
index 0db73447dc..6b0dedbde5 100644
--- a/resources/job_specifications/ts_3n-snr.yaml
+++ b/resources/job_specifications/ts_3n-snr.yaml
@@ -37,19 +37,35 @@ test-sets:
       - ipsec-sw-async-aes128gcm-md
       - ipsec-sw-async-aes256gcm-md
 
-  3n-snr-vpp-cov-ip4-00:
+  3n-snr-vpp-cov-crypto-02:
     infra:
-      25ge2p1e822cq:
+      100ge2p1e810cq:
+        - vfio-pci
+    framesize: [1518, ]
+    tests:
+      - ipsec-sw-reassembly-sm
+
+  3n-snr-vpp-cov-crypto-03:
+    infra:
+      100ge2p1e810cq:
+        - vfio-pci
+    tests:
+      - ipsec-sw-udp:
+          framesize: [1518, ]
+          core: [1, ]
+
+  3n-snr-vpp-cov-crypto-04:
+    infra:
+      100ge2p1e810cq:
         - vfio-pci
     framesize:
       - 64
       - 1518: [1, 2]
-      - 9000: [1, ]
       - imix
     tests:
-      - ip4-lg
+      - ipsec-hw-async-aes256gcm-md
 
-  3n-snr-vpp-cov-ip4-01:
+  3n-snr-vpp-cov-ip4-00:
     infra:
       25ge2p1e822cq:
         - vfio-pci
@@ -59,7 +75,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-pol-md
+      - ip4-lg
 
   3n-snr-vpp-cov-ip4tun-00:
     infra:
@@ -81,6 +97,8 @@ test-sets:
     tests:
       - wireguard-sw-lg
       - wireguard-hw-lg
+      - gtpu-sw-reassembly-sm:
+          framesize: [1518, ]
 
   3n-snr-vpp-cov-ip6-00:
     infra:
@@ -92,19 +110,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  3n-snr-vpp-cov-ip6-01:
-    infra:
-      25ge2p1e822cq:
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-scale-md
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3n-snr-vpp-cov-l2-00:
     infra:
@@ -117,17 +124,6 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3n-snr-vpp-cov-l2-01:
-    infra:
-      25ge2p1e822cq:
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
 
diff --git a/resources/job_specifications/ts_3na-spr.yaml b/resources/job_specifications/ts_3na-spr.yaml
index a320f8ca6c..df7c920d3f 100644
--- a/resources/job_specifications/ts_3na-spr.yaml
+++ b/resources/job_specifications/ts_3na-spr.yaml
@@ -45,14 +45,6 @@ test-sets:
       - ipsec-sw-async-aes128gcm-md
       - ipsec-sw-async-aes256gcm-md
 
-  3na-spr-vpp-cov-crypto-04:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize: [64, 1518, imix]
-    tests:
-      - ipsec-sw-fixtnlip-md
-
   3na-spr-vpp-cov-ip4-00:
     infra:
       200ge2p1cx7veat:
@@ -63,7 +55,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-2-md
+      - ip4-lg
       - ip4-60k-sm:
           infra:
             200ge6p3cx7veat:
@@ -71,30 +63,6 @@ test-sets:
           framesize: [64, 1518, imix]
           core: [3, 6, 12]
 
-  3na-spr-vpp-cov-ip4-01:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-pol-md
-
-  3na-spr-vpp-cov-ip4-02:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip4-acl-lg
-
   3na-spr-vpp-cov-ip4tun-00:
     infra:
       200ge2p1cx7veat:
@@ -116,18 +84,6 @@ test-sets:
       - wireguard-sw-lg
 
   3na-spr-vpp-cov-ip4tun-02:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lisp-sm
-
-  3na-spr-vpp-cov-ip4tun-03:
     infra:
       200ge2p1cx7veat:
         - mlx5_core
@@ -149,31 +105,8 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
-
-  3na-spr-vpp-cov-ip6-01:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-scale-md
-
-  3na-spr-vpp-cov-ip6tun-00:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-lisp-sm
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3na-spr-vpp-cov-l2-00:
     infra:
@@ -186,55 +119,8 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3na-spr-vpp-cov-l2-01:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
-  3na-spr-vpp-cov-l2-02:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-acl-xl
-
-  3na-spr-vpp-cov-l2-03:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-macip-md
-
-  3na-spr-vpp-cov-memif-00:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - container-memif-sw-sm
-
   3na-spr-vpp-cov-srv6-00:
     infra:
       200ge2p1cx7veat:
@@ -247,19 +133,6 @@ test-sets:
     tests:
       - srv6-lg
 
-  3na-spr-vpp-cov-vhost-00:
-    infra:
-      200ge2p1cx7veat:
-        - mlx5_core
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
 
   3na-spr-vpp-iterative:
     infra:
@@ -273,7 +146,7 @@ test-sets:
           core: [1, ]
       - ipsec-sw-async-md:
           core: [2, 3, 4]
-      - ip4-2-md:
+      - ip4-md:
           framesize: [64, ]
       - ip4-60k-sm:
           infra:
diff --git a/resources/job_specifications/ts_3nb-spr.yaml b/resources/job_specifications/ts_3nb-spr.yaml
index 8024070037..757d1efdb0 100644
--- a/resources/job_specifications/ts_3nb-spr.yaml
+++ b/resources/job_specifications/ts_3nb-spr.yaml
@@ -21,7 +21,6 @@ test-sets:
     core: [1, ]
     tests:
       - ipsec-sw-aes128cbc-hmac512sha-lg
-      - ipsec-sw-policy-aes256gcm-sm
 
   3nb-spr-vpp-cov-crypto-01:
     infra:
@@ -34,20 +33,9 @@ test-sets:
       - imix
     tests:
       - ipsec-sw-aes128gcm-lg
-
-  3nb-spr-vpp-cov-crypto-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - imix
-    tests:
       - ipsec-sw-aes256gcm-lg
 
-  3nb-spr-vpp-cov-crypto-03:
+  3nb-spr-vpp-cov-crypto-02:
     infra:
       100ge2p1e810cq:
         - avf
@@ -59,15 +47,7 @@ test-sets:
       - ipsec-sw-async-aes128gcm-md
       - ipsec-sw-async-aes256gcm-md
 
-  3nb-spr-vpp-cov-crypto-04:
-    infra:
-      25ge2p1e810xxv:
-        - vfio-pci
-    framesize: [64, 1518, imix]
-    tests:
-      - ipsec-sw-fixtnlip-md
-
-  3nb-spr-vpp-cov-crypto-05:
+  3nb-spr-vpp-cov-crypto-03:
     infra:
       100ge2p1e810cq:
         - vfio-pci
@@ -79,33 +59,24 @@ test-sets:
       - ipsec-hw-async-aes256gcm-md
       - ipsec-hw-async-policy-aes256gcm-md
 
-  3nb-spr-vpp-cov-ip4-00:
+  3nb-spr-vpp-cov-crypto-04:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
+    framesize: [1518, ]
     tests:
-      - ip4-2-md
+      - ipsec-sw-reassembly-sm
 
-  3nb-spr-vpp-cov-ip4-01:
+  3nb-spr-vpp-cov-crypto-05:
     infra:
       100ge2p1e810cq:
-        - avf
         - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
     tests:
-      - ip4-pol-md
+      - ipsec-sw-udp:
+          framesize: [1518, ]
+          core: [1, ]
 
-  3nb-spr-vpp-cov-ip4-02:
+  3nb-spr-vpp-cov-ip4-00:
     infra:
       100ge2p1e810cq:
         - avf
@@ -116,7 +87,7 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip4-acl-lg
+      - ip4-lg
 
   3nb-spr-vpp-cov-ip4tun-00:
     infra:
@@ -143,19 +114,6 @@ test-sets:
     tests:
       - wireguard-sw-lg
 
-  3nb-spr-vpp-cov-ip4tun-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - lisp-sm
-
   3nb-spr-vpp-cov-ip4tun-03:
     infra:
       100ge2p1e810cq:
@@ -190,22 +148,10 @@ test-sets:
       - 9000: [1, ]
       - imix
     tests:
-      - ip6-acl-md
+      - ip6-base-sm
+      - ip6-scale-lg
 
   3nb-spr-vpp-cov-ip6-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 78
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-scale-md
-
-  3nb-spr-vpp-cov-ip6-02:
     infra:
       25ge2p1e810xxv:
         - avf
@@ -218,19 +164,6 @@ test-sets:
     tests:
       - ip6-base-sm
 
-  3nb-spr-vpp-cov-ip6tun-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - ip6-lisp-sm
-
   3nb-spr-vpp-cov-l2-00:
     infra:
       100ge2p1e810cq:
@@ -246,59 +179,8 @@ test-sets:
       - imix
     tests:
       - l2-base-md
-
-  3nb-spr-vpp-cov-l2-01:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
       - l2-scale-md
 
-  3nb-spr-vpp-cov-l2-02:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-acl-xl
-
-  3nb-spr-vpp-cov-l2-03:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - l2-macip-md
-
-  3nb-spr-vpp-cov-memif-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - container-memif-sw-sm
-
   3nb-spr-vpp-cov-srv6-00:
     infra:
       100ge2p1e810cq:
@@ -325,34 +207,6 @@ test-sets:
     tests:
       - srv6-lg
 
-  3nb-spr-vpp-cov-vhost-00:
-    infra:
-      100ge2p1e810cq:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
-  3nb-spr-vpp-cov-vhost-10:
-    infra:
-      25ge2p1e810xxv:
-        - avf
-        - vfio-pci
-    framesize:
-      - 64
-      - 1518: [1, 2]
-      - 9000: [1, ]
-      - imix
-    tests:
-      - vhost-2-md
-      - vhost-vxlan-2-sm
-
 
   3nb-spr-vpp-iterative:
     infra:
@@ -437,18 +291,6 @@ test-sets:
       - ip6-base-sm:
           framesize: [78, ]
       - l2-base-md:
-          infra:
-            100ge2p1e810cq:
-              - avf
-            25ge2p1e810xxv:
-              - avf
-          framesize: [64, ]
-      - l2-sm:
-          infra:
-            100ge2p1e810cq:
-              - vfio-pci
-            25ge2p1e810xxv:
-              - vfio-pci
           framesize: [64, ]
       - srv6-lg:
           infra:
diff --git a/resources/libraries/python/suite_generator/suite_generator.py b/resources/libraries/python/suite_generator/suite_generator.py
index 0328ce606d..8a99e3656d 100755
--- a/resources/libraries/python/suite_generator/suite_generator.py
+++ b/resources/libraries/python/suite_generator/suite_generator.py
@@ -742,8 +742,8 @@ def suite_generator(args) -> int:
 
     # Generate suites:
     if generate_all or tb_generate_all:  # All or all for the given testbed
-        if generate_all:
-            logging.getLogger().setLevel(logging.ERROR)
+        # if generate_all:
+        #     logging.getLogger().setLevel(logging.ERROR)
         tbed = "-".join(job.split("-")[-2:])
         ret_val = 0
         for sjob in spec["jobs"]:
-- 
2.16.6