Tests: Remove GBP

- Specs
- Tests
- Library
- TODO: PAL

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I8890940d56c7a9924d4a5f9365b6bb881610db14

10 files changed, 8 insertions, 119 deletions

diff --git a/docs/job_specs/report_coverage/2n-clx/l2-00.md b/docs/job_specs/report_coverage/2n-clx/l2-00.md
index 5e8d9d8d46..de4173d181 100644
--- a/docs/job_specs/report_coverage/2n-clx/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-clx/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-clx
-### tests 189
+### tests 171
 ### job hrs est. 9.77
 ### job hrs real 9.77
 ### test mins est. 3.1
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ### mellanox-cx556a
 #### rdma-core
 ##### eth-l2patch
diff --git a/docs/job_specs/report_coverage/2n-dnv/l2-00.md b/docs/job_specs/report_coverage/2n-dnv/l2-00.md
index d953e833a4..f98f53d77e 100644
--- a/docs/job_specs/report_coverage/2n-dnv/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-dnv/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-dnv
-### tests 54
+### tests 45
 ### job hrs est. 3.38
 ### job hrs real 3.38
 ### test mins est. 3.75
@@ -63,16 +63,6 @@
 1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND x553 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ## ./lb
 ## ./nfv_density/dcr_memif/chain
 ## ./nfv_density/dcr_memif/chain_ipsec
diff --git a/docs/job_specs/report_coverage/2n-skx/l2-00.md b/docs/job_specs/report_coverage/2n-skx/l2-00.md
index d99db1e2ce..94a76ecf66 100644
--- a/docs/job_specs/report_coverage/2n-skx/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-skx/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 162
+### tests 144
 ### job hrs est. 10
 ### job hrs real 10
 ### test mins est. 3.7
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ## ./lb
 ## ./nfv_density/dcr_memif/chain
 ## ./nfv_density/dcr_memif/chain_ipsec
diff --git a/docs/job_specs/report_coverage/2n-zn2/l2-00.md b/docs/job_specs/report_coverage/2n-zn2/l2-00.md
index 48adf92a40..565fadd36d 100644
--- a/docs/job_specs/report_coverage/2n-zn2/l2-00.md
+++ b/docs/job_specs/report_coverage/2n-zn2/l2-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 189
+### tests 171
 ### job hrs est. 9.77
 ### job hrs real 9.77
 ### test mins est. 3.1
@@ -126,16 +126,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 #### dpdk-vfio-pci
 ##### eth-l2patch
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND eth-l2patch
@@ -187,16 +177,6 @@
 1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
 4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND 1518b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND 9000b AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-1c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-2c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
-4c AND imix AND ndrpdr AND xxv710 AND drv_vfio_pci AND dot1q-l2bdbasemaclrn-gbp
 ### mellanox-cx556a
 #### rdma-core
 ##### eth-l2patch
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
index e08f119697..621e88c10c 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mlr-00.md
@@ -457,10 +457,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -520,10 +516,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
index f99a65046f..6400677605 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-mrr-00.md
@@ -457,10 +457,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -520,11 +516,6 @@
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-##### eth-l2xcbase
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
index af625b6c51..eaccf91c5f 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mlr-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 255
+### tests 249
 ### job hrs est. 24.5
 ### job hrs real 24.5
 ### test mins est. 5.76
@@ -263,10 +263,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
index 4633026366..ef96d6b516 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-mrr-00.md
@@ -1,5 +1,5 @@
 # 2n-skx
-### tests 255
+### tests 249
 ### job hrs est. 22.6
 ### job hrs real 22.6
 ### test mins est. 2.86
@@ -263,10 +263,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
index 5a0c331ece..50ed95b3af 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-mlr-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 363
+### tests 357
 ### job hrs est. 35
 ### job hrs real 35
 ### test mins est. 5.78
@@ -361,10 +361,6 @@
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -424,10 +420,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND ndrpdr AND cx556a AND drv_rdma_core AND eth-l2xcbase
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
index 93417cf5a4..2127e7d5e5 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-mrr-00.md
@@ -1,5 +1,5 @@
 # 2n-zn2
-### tests 363
+### tests 357
 ### job hrs est. 10
 ### job hrs real 10
 ### test mins est. 1.65
@@ -361,10 +361,6 @@
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND eth-l2xcbase
@@ -424,10 +420,6 @@
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
 4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn
-##### dot1q-l2bdbasemaclrn-gbp
-1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
-4c AND 64b AND mrr AND cx556a AND drv_rdma_core AND dot1q-l2bdbasemaclrn-gbp
 ##### eth-l2xcbase
 1c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase
 2c AND 64b AND mrr AND cx556a AND drv_rdma_core AND eth-l2xcbase