feat(jobspec): Base 2n-grc on 2n-icx

+ Test only mlx5-core, as rdma-core tests are crashing in verify.
- Only edited iterative mrr and ndrpdr.

Change-Id: I3f7a7e14aec0e25456bf330d9e01feac515de5cd
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

2 files changed, 10 insertions, 16 deletions

diff --git a/resources/job_specs/report_iterative/2n-grc/vpp-mrr-00.md b/resources/job_specs/report_iterative/2n-grc/vpp-mrr-00.md
index d0e887ced8..d7219be16d 100644
--- a/resources/job_specs/report_iterative/2n-grc/vpp-mrr-00.md
+++ b/resources/job_specs/report_iterative/2n-grc/vpp-mrr-00.md
@@ -6,9 +6,6 @@
 1c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 1518b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 1518b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 1518b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2memif-1dcr
@@ -69,9 +66,9 @@
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-cps
 4c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-cps
 ##### ethip4udp-ip4base-h65536-p63-s4128768-tput
-1c AND 100b AND mrr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND mrr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND mrr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND mrr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+2c AND 100b AND mrr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+4c AND 100b AND mrr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h65536-p63-s4128768-cps
 1c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4tcp-nat44ed-h65536-p63-s4128768-cps
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4tcp-nat44ed-h65536-p63-s4128768-cps
@@ -104,7 +101,7 @@
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4--ethip4udpgeneve-256tun-ip4base
 4c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND ethip4--ethip4udpgeneve-256tun-ip4base
 ## ./ip6
-### intel-cx556a
+### mellanox-cx556a
 #### mlx5-core
 ##### ethip6-ip6base
 1c AND 78b AND mrr AND cx556a AND drv_mlx5_core AND ethip6-ip6base
@@ -163,4 +160,4 @@
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 1c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
\ No newline at end of file
+4c AND 64b AND mrr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
diff --git a/resources/job_specs/report_iterative/2n-grc/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/2n-grc/vpp-ndrpdr-00.md
index e603fb56c0..8636c0c5d2 100644
--- a/resources/job_specs/report_iterative/2n-grc/vpp-ndrpdr-00.md
+++ b/resources/job_specs/report_iterative/2n-grc/vpp-ndrpdr-00.md
@@ -6,9 +6,6 @@
 1c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 4c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-1c AND 1518b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-2c AND 1518b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
-4c AND 1518b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2bdbasemaclrn-eth-2memif-1dcr
 ##### eth-l2xcbase-eth-2memif-1dcr
 1c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2memif-1dcr
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2memif-1dcr
@@ -69,9 +66,9 @@
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-cps
 4c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-cps
 ##### ethip4udp-ip4base-h65536-p63-s4128768-tput
-1c AND 100b AND ndrpdr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND ndrpdr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND ndrpdr AND e810cq AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+2c AND 100b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
+4c AND 100b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4udp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h65536-p63-s4128768-cps
 1c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4tcp-nat44ed-h65536-p63-s4128768-cps
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4tcp-nat44ed-h65536-p63-s4128768-cps
@@ -104,7 +101,7 @@
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4--ethip4udpgeneve-256tun-ip4base
 4c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip4--ethip4udpgeneve-256tun-ip4base
 ## ./ip6
-### intel-cx556a
+### mellanox-cx556a
 #### mlx5-core
 ##### ethip6-ip6base
 1c AND 78b AND ndrpdr AND cx556a AND drv_mlx5_core AND ethip6-ip6base
@@ -163,4 +160,4 @@
 ##### eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 1c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
 2c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
-4c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc
\ No newline at end of file
+4c AND 64b AND ndrpdr AND cx556a AND drv_mlx5_core AND eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc