Bash: Process job-specs without cores and drivers

- job-spec for trex tests modified

Change-Id: Id04d76648f30baacfa027b182a838d2f681afcec
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/docs/job_specs/report_iterative/2n-skx/trex-mlr-00.md b/docs/job_specs/report_iterative/2n-skx/trex-mlr-00.md
index e5a6b74..524df1e 100644 (file)
--- a/docs/job_specs/report_iterative/2n-skx/trex-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/trex-mlr-00.md
@@ -1,35 +1,31 @@
 # 2n-skx
 ### tests 13
-### job hrs est. ?.??
-### job hrs real ?.??
-### test mins est. ?.??
-### test mins real ?.??
 ## ./ip4
 ##### ethip4-ip4base-tg
-64b AND ndrpdr AND x710 AND ethip4-ip4base-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4-ip4base-tg
 ##### ethip4-ip4scale2m-tg
-64b AND ndrpdr AND x710 AND ethip4-ip4scale2m-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4-ip4scale2m-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-pps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
-78b AND ndrpdr AND x710 AND ethip6-ip6base-tg
+- AND 78b AND ndrpdr AND x710 AND - AND ethip6-ip6base-tg
 ##### ethip6-ip6scale2m-tg
-78b AND ndrpdr AND x710 AND ethip6-ip6scale2m-tg
+- AND 78b AND ndrpdr AND x710 AND - AND ethip6-ip6scale2m-tg
 ## ./l2
 ##### eth-l2bdscale1mmaclrn-tg
-64b AND ndrpdr AND x710 AND eth-l2bdscale1mmaclrn-tg
+- AND 64b AND ndrpdr AND x710 AND - AND eth-l2bdscale1mmaclrn-tg

diff --git a/docs/job_specs/report_iterative/2n-skx/trex-mrr-00.md b/docs/job_specs/report_iterative/2n-skx/trex-mrr-00.md
index b21303f..6fc9031 100644 (file)
--- a/docs/job_specs/report_iterative/2n-skx/trex-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/trex-mrr-00.md
@@ -1,35 +1,31 @@
 # 2n-skx
 ### tests 13
-### job hrs est. ?.??
-### job hrs real ?.??
-### test mins est. ?.??
-### test mins real ?.??
 ## ./ip4
 ##### ethip4-ip4base-tg
-64b AND mrr AND x710 AND ethip4-ip4base-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4-ip4base-tg
 ##### ethip4-ip4scale2m-tg
-64b AND mrr AND x710 AND ethip4-ip4scale2m-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4-ip4scale2m-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-pps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
-78b AND mrr AND x710 AND ethip6-ip6base-tg
+- AND 78b AND mrr AND x710 AND - AND ethip6-ip6base-tg
 ##### ethip6-ip6scale2m-tg
-78b AND mrr AND x710 AND ethip6-ip6scale2m-tg
+- AND 78b AND mrr AND x710 AND - AND ethip6-ip6scale2m-tg
 ## ./l2
 ##### eth-l2bdscale1mmaclrn-tg
-64b AND mrr AND x710 AND eth-l2bdscale1mmaclrn-tg
+- AND 64b AND mrr AND x710 AND - AND eth-l2bdscale1mmaclrn-tg

diff --git a/docs/job_specs/report_iterative/3n-skx/trex-mlr-00.md b/docs/job_specs/report_iterative/3n-skx/trex-mlr-00.md
index e5a6b74..1480fb9 100644 (file)
--- a/docs/job_specs/report_iterative/3n-skx/trex-mlr-00.md
+++ b/docs/job_specs/report_iterative/3n-skx/trex-mlr-00.md
@@ -1,35 +1,31 @@
-# 2n-skx
+# 3n-skx
 ### tests 13
-### job hrs est. ?.??
-### job hrs real ?.??
-### test mins est. ?.??
-### test mins real ?.??
 ## ./ip4
 ##### ethip4-ip4base-tg
-64b AND ndrpdr AND x710 AND ethip4-ip4base-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4-ip4base-tg
 ##### ethip4-ip4scale2m-tg
-64b AND ndrpdr AND x710 AND ethip4-ip4scale2m-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4-ip4scale2m-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND ndrpdr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-pps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND ndrpdr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND ndrpdr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
-78b AND ndrpdr AND x710 AND ethip6-ip6base-tg
+- AND 78b AND ndrpdr AND x710 AND - AND ethip6-ip6base-tg
 ##### ethip6-ip6scale2m-tg
-78b AND ndrpdr AND x710 AND ethip6-ip6scale2m-tg
+- AND 78b AND ndrpdr AND x710 AND - AND ethip6-ip6scale2m-tg
 ## ./l2
 ##### eth-l2bdscale1mmaclrn-tg
-64b AND ndrpdr AND x710 AND eth-l2bdscale1mmaclrn-tg
+- AND 64b AND ndrpdr AND x710 AND - AND eth-l2bdscale1mmaclrn-tg

diff --git a/docs/job_specs/report_iterative/3n-skx/trex-mrr-00.md b/docs/job_specs/report_iterative/3n-skx/trex-mrr-00.md
index f3a2a6f..0728940 100644 (file)
--- a/docs/job_specs/report_iterative/3n-skx/trex-mrr-00.md
+++ b/docs/job_specs/report_iterative/3n-skx/trex-mrr-00.md
@@ -1,35 +1,31 @@
 # 3n-skx
 ### tests 13
-### job hrs est. ?.??
-### job hrs real ?.??
-### test mins est. ?.??
-### test mins real ?.??
 ## ./ip4
 ##### ethip4-ip4base-tg
-64b AND mrr AND x710 AND ethip4-ip4base-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4-ip4base-tg
 ##### ethip4-ip4scale2m-tg
-64b AND mrr AND x710 AND ethip4-ip4scale2m-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4-ip4scale2m-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND mrr AND x710 AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-cps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-cps-tg
 ##### ethip4udp-ip4base-h1024-p63-s64512-pps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h1024-p63-s64512-pps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
 ##### ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
-64b AND mrr AND x710 AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
+- AND 64b AND mrr AND x710 AND - AND ethip4udp-ip4base-h262144-p63-s16515072-pps-tg
 ## ./ip6
 ##### ethip6-ip6base-tg
-78b AND mrr AND x710 AND ethip6-ip6base-tg
+- AND 78b AND mrr AND x710 AND - AND ethip6-ip6base-tg
 ##### ethip6-ip6scale2m-tg
-78b AND mrr AND x710 AND ethip6-ip6scale2m-tg
+- AND 78b AND mrr AND x710 AND - AND ethip6-ip6scale2m-tg
 ## ./l2
 ##### eth-l2bdscale1mmaclrn-tg
-64b AND mrr AND x710 AND eth-l2bdscale1mmaclrn-tg
+- AND 64b AND mrr AND x710 AND - AND eth-l2bdscale1mmaclrn-tg

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index e56799e..85f6e08 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -861,7 +861,9 @@ function select_tags () {
     awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'
     awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";'
     awk_nics_sub_cmd+='else drv="";'
-    awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-"$1"-" drv $11"-"$5'
+    awk_nics_sub_cmd+='if ($1 =="-") cores="";'
+    awk_nics_sub_cmd+='else cores=$1;'
+    awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-" cores "-" drv $11"-"$5'
 
     # Tag file directory shorthand.
     tfd="${JOB_SPECS_DIR}"