feat(jobspec): improve tput selection

+ Revert bad edit on 2n-dnv, add 1518b back.
+ Add 1c ip4base tput everywhere nat44ed tput is tested.
 + Both tcp and udp.
+ Use only 1c tests for ip4base tput.
+ Use the same selection in mrr as in mlr.
- 2n-tx2 and 2n-zn2 still have no ASTF tests.
- ASTF tests still only tested on xxv710, no 100ge tests yet.

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

2 files changed, 24 insertions, 24 deletions

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 580c0ddb69..4c9783d9da 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
@@ -142,16 +142,16 @@
 4c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-tput
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 ##### ethip4udp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
 ##### ethip4udp-ip4base-h65536-p63-s4128768-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
+##### ethip4udp-ip4base-h1024-p63-s64512-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-tput
+##### ethip4udp-ip4base-h16384-p63-s1032192-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-tput
+##### ethip4udp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
@@ -178,16 +178,16 @@
 4c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
 ##### ethip4tcp-ip4base-h65536-p63-s4128768-cps
 1c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
-2c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
-4c AND 64b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
+##### ethip4tcp-ip4base-h1024-p63-s64512-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-tput
+##### ethip4tcp-ip4base-h16384-p63-s1032192-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
+##### ethip4tcp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND ndrpdr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
 #### dpdk-vfio-pci
 ##### ethip4-ip4base
 1c AND 64b AND ndrpdr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base
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 835077678a..8e910bb0fa 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
@@ -142,16 +142,16 @@
 4c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4udp-nat44ed-h65536-p63-s4128768-tput
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-cps
 ##### ethip4udp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-cps
 ##### ethip4udp-ip4base-h65536-p63-s4128768-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-cps
+##### ethip4udp-ip4base-h1024-p63-s64512-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h1024-p63-s64512-tput
+##### ethip4udp-ip4base-h16384-p63-s1032192-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h16384-p63-s1032192-tput
+##### ethip4udp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4udp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
 2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h1024-p63-s64512-cps
@@ -178,16 +178,16 @@
 4c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-cps
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-cps
 ##### ethip4tcp-ip4base-h65536-p63-s4128768-cps
 1c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
-2c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
-4c AND 64b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-cps
+##### ethip4tcp-ip4base-h1024-p63-s64512-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h1024-p63-s64512-tput
+##### ethip4tcp-ip4base-h16384-p63-s1032192-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
+##### ethip4tcp-ip4base-h65536-p63-s4128768-tput
+1c AND 100b AND mrr AND xxv710 AND drv_avf AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
 #### dpdk-vfio-pci
 ##### ethip4-ip4base
 1c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND ethip4-ip4base