Report: Add release data, trex coverage

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I40fd7691548a1d6fcdf906ba5c899241dbb7c001
(cherry picked from commit 4bb5b6a0426c67cdf02f7fe58722a37c6a2f6a9e)

7 files changed, 82 insertions, 21 deletions

diff --git a/docs/report/detailed_test_results/trex_performance_results/index.rst b/docs/report/detailed_test_results/trex_performance_results/index.rst
index 81ea8711ce..a878244396 100644
--- a/docs/report/detailed_test_results/trex_performance_results/index.rst
+++ b/docs/report/detailed_test_results/trex_performance_results/index.rst
@@ -3,4 +3,5 @@ TRex Throughput
 
 .. toctree::
 
-    ../trex_performance_results_2n_skx/index
+    ../trex_performance_results_1n_aws/index
+    ../trex_performance_results_2n_icx/index
diff --git a/docs/report/detailed_test_results/trex_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/trex_performance_results_1n_aws/index.rst
index 8607595606..7e2a8045a7 100644
--- a/docs/report/detailed_test_results/trex_performance_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/trex_performance_results_1n_aws/index.rst
@@ -1,10 +1,10 @@
-2n-skx
+1n-aws
 ------
 
 .. note::
 
     Data sources for reported test results:
-    i) `build logs from FD.io trex coverage job 2n-skx`_,
+    i) `build logs from FD.io trex coverage job 1n-aws`_,
     ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
diff --git a/docs/report/detailed_test_results/trex_performance_results_2n_icx/index.rst b/docs/report/detailed_test_results/trex_performance_results_2n_icx/index.rst
new file mode 100644
index 0000000000..9d5a3a2fa8
--- /dev/null
+++ b/docs/report/detailed_test_results/trex_performance_results_2n_icx/index.rst
@@ -0,0 +1,12 @@
+2n-icx
+------
+
+.. note::
+
+    Data sources for reported test results:
+    i) `build logs from FD.io trex coverage job 2n-icx`_,
+    ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 733e4cd5ec..360f4607d9 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -37,8 +37,7 @@
       - 1   # rls2210.rel NDRPDR iter env 11
 
   trex-2n-icx-curr-cov:
-    # csit-trex-perf-report-coverage-2210-2n-icx:
-    csit-trex-perf-report-coverage-2206-2n-icx:
+    csit-trex-perf-report-coverage-2210-2n-icx:
       - 1   # rls2210.rel NDRPDR cov env 11
 
   # TRex 1n-aws
@@ -69,8 +68,7 @@
       - 5   # rls2210.rel NDRPDR iter env 11
 
   trex-1n-aws-curr-cov:
-    # csit-trex-perf-report-coverage-2210-1n-aws:
-    csit-trex-perf-report-coverage-2206-1n-aws:
+    csit-trex-perf-report-coverage-2210-1n-aws:
       - 1   # rls2210.rel NDRPDR cov env 11
 
   # 2n-zn2
@@ -114,6 +112,7 @@
       - 20  # rls2210.rel NDRPDR iter env 11
       - 21  # rls2210.rel NDRPDR iter env 11
       - 22  # rls2210.rel NDRPDR iter env 11
+      - 23  # rls2210.rel NDRPDR iter env 11
 
   vpp-2n-zn2-curr-iter-best:
     csit-vpp-perf-report-iterative-2210-2n-zn2:
@@ -326,6 +325,7 @@
   vpp-2n-clx-curr-soak:
     csit-vpp-perf-report-iterative-2210-2n-clx:
       - 61  # rls2210.rel soak env 11
+      - 80  # rls2210.rel soak env 11
   vpp-soak-vs-ndr-2n-clx-ref:
     csit-vpp-perf-report-iterative-2210-2n-clx:
       - 46  # rls2210.rel NDRPDR iter env 11
@@ -351,6 +351,7 @@
       - 78  # rls2210.rel NDRPDR iter env 11
       - 79  # rls2210.rel NDRPDR iter env 11
       - 61  # rls2210.rel soak env 11
+      - 80  # rls2210.rel soak env 11
 
   vpp-2n-clx-curr-cov:
     csit-vpp-perf-report-coverage-2210-2n-clx:
@@ -454,6 +455,7 @@
       - 11  # rls2210.rel NDRPDR iter env 11
       - 12  # rls2210.rel NDRPDR iter env 11
       - 13  # rls2210.rel NDRPDR iter env 11
+      - 14  # rls2210.rel NDRPDR iter env 11
 
   vpp-3n-tsh-curr-iter-best:
     csit-vpp-perf-report-iterative-2210-3n-tsh:
@@ -574,6 +576,7 @@
       - 14  # rls2210.rel NDRPDR iter env 11
       - 15  # rls2210.rel NDRPDR iter env 11
       - 16  # rls2210.rel NDRPDR iter env 11
+      - 18  # rls2210.rel NDRPDR iter env 11
 
   vpp-2n-tx2-curr-iter-best:
     csit-vpp-perf-report-iterative-2210-2n-tx2:
@@ -979,10 +982,14 @@
       - 62  # rls2210.rel NDRPDR reconf iter env 11
       - 68  # rls2210.rel NDRPDR reconf iter env 11
       - 72  # rls2210.rel NDRPDR reconf iter env 11
+      - 83  # rls2210.rel NDRPDR reconf iter env 11
+      - 84  # rls2210.rel NDRPDR reconf iter env 11
+      - 85  # rls2210.rel NDRPDR reconf iter env 11
 
   vpp-2n-icx-curr-soak:
     csit-vpp-perf-report-iterative-2210-2n-icx:
       - 63  # rls2210.rel soak env 11
+      - 86  # rls2210.rel soak env 11
   vpp-soak-vs-ndr-2n-icx-ref:
     csit-vpp-perf-report-iterative-2210-2n-icx:
       - 47  # rls2210.rel NDRPDR iter env 11
@@ -1008,6 +1015,7 @@
       - 80  # rls2210.rel NDRPDR iter env 11
       - 81  # rls2210.rel NDRPDR iter env 11
       - 63  # rls2210.rel soak env 11
+      - 86  # rls2210.rel soak env 11
 
   vpp-2n-icx-curr-iter-gso:
     csit-vpp-perf-report-iterative-2210-2n-icx:
@@ -1121,8 +1129,8 @@
       - 32  # rls2210.rel NDRPDR iter env 11
       - 33  # rls2210.rel NDRPDR iter env 11
       - 34  # rls2210.rel NDRPDR iter env 11
-      # - 35  # rls2210.rel NDRPDR iter env 11
-      # - 37  # rls2210.rel NDRPDR iter env 11
+      - 35  # rls2210.rel NDRPDR iter env 11
+      # - 38  # rls2210.rel NDRPDR iter env 11
 
   vpp-3n-icx-curr-iter-best:
     csit-vpp-perf-report-iterative-2210-3n-icx:
@@ -1143,7 +1151,7 @@
 
   vpp-3n-icx-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2210-3n-icx:
-      - 25  # rls2210.rel MRR iter env 11
+      - 43  # rls2210.rel MRR iter env 11
 
   # vpp-3n-icx-hist-iter-hoststack-new-env:
   #   csit-vpp-perf-report-iterative-2110-3n-icx:
@@ -1155,16 +1163,16 @@
 
   vpp-3n-icx-curr-iter-hoststack:
     csit-vpp-perf-report-iterative-2210-3n-icx:
-      - 17  # rls2210.rc2 hoststack iter env 11
-      - 21  # rls2210.rc2 hoststack iter env 11
-      - 22  # rls2210.rc2 hoststack iter env 11
-      - 23  # rls2210.rc2 hoststack iter env 11
-      - 24  # rls2210.rc2 hoststack iter env 11
+      - 39  # rls2210.rel hoststack iter env 11
+      - 40  # rls2210.rel hoststack iter env 11
+      - 41  # rls2210.rel hoststack iter env 11
+      - 42  # rls2210.rel hoststack iter env 11
 
   vpp-3n-icx-curr-cov:
     csit-vpp-perf-report-coverage-2210-3n-icx:
       - 7   # rls2210.rel NDRPDR cov env 11
       - 8   # rls2210.rel NDRPDR cov env 11
+      - 9   # rls2210.rel NDRPDR cov env 11
       - 10  # rls2210.rel NDRPDR cov env 11
 
   dpdk-3n-icx-hist-iter:
@@ -1239,6 +1247,7 @@
       - 12  # rls2210.rel NDRPDR iter env 11
       - 13  # rls2210.rel NDRPDR iter env 11
       - 14  # rls2210.rel NDRPDR iter env 11
+      - 15  # rls2210.rel NDRPDR iter env 11
 
   vpp-3n-alt-curr-iter-best:
     csit-vpp-perf-report-iterative-2210-3n-alt:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9734ca23af..3b47978ebd 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -26,6 +26,8 @@
       data-set: "vpp-2n-icx-curr-nfv-reconf"
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-icx-curr-iter"
+    - job-spec: "trex-mlr-00"
+      data-set: "trex-2n-icx-curr-iter
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-icx-coverage"
@@ -176,8 +178,6 @@
       data-set: "vpp-2n-clx-curr-iter-gso"
     - job-spec: "soak-00"
       data-set: "vpp-2n-clx-curr-soak"
-    # - job-spec: "vsap-00"
-    #   data-set: "vpp-2n-clx-curr-iter-vsap"
     - job-spec: "nfv-density-mrr-00"
       data-set: "vpp-2n-clx-curr-nfv-mrr"
     - job-spec: "nfv-density-mlr-00"
@@ -5922,6 +5922,42 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - TRex Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,2N,ICX]}/trex_performance_results_2n_icx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "trex-2n-icx-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - TRex Performance Results 1n-aws
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 1n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,1N,AWS]}/trex_performance_results_1n_aws"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "trex-1n-aws-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index b728edf1f8..67b797b041 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -46,7 +46,8 @@
     DIR[DTR,PERF,DPDK,3N,ALT]: "{DIR[DTR]}/dpdk_performance_results_3n_alt"
     DIR[DTR,PERF,DPDK,3N,TSH]: "{DIR[DTR]}/dpdk_performance_results_3n_tsh"
     DIR[DTR,PERF,DPDK,2N,TX2]: "{DIR[DTR]}/dpdk_performance_results_2n_tx2"
-    # DIR[DTR,PERF,TREX,2N,SKX]: "{DIR[DTR]}/trex_performance_results_2n_skx"
+    DIR[DTR,PERF,TREX,2N,ICX]: "{DIR[DTR]}/trex_performance_results_2n_icx"
+    DIR[DTR,PERF,TREX,1N,AWS]: "{DIR[DTR]}/trex_performance_results_1n_aws"
     DIR[DTR,PERF,VPP,ALL]: "{DIR[DTR]}/vpp_performance_results"
     DIR[DTR,PERF,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_performance_results_2n_zn2"
     DIR[DTR,PERF,VPP,2N,CLX]: "{DIR[DTR]}/vpp_performance_results_2n_clx"
diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py
index 6cf661e883..6fc398e145 100644
--- a/resources/tools/presentation/sphinx_conf/report/conf.py
+++ b/resources/tools/presentation/sphinx_conf/report/conf.py
@@ -86,7 +86,8 @@ rst_epilog = """
 .. _FD.io CSIT testbeds - Xeon Ice Lake: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_icx_hw_bios_cfg.md?h={release}
 .. _FD.io CSIT testbeds - Xeon Cascade Lake: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_clx_hw_bios_cfg.md?h={release}
 .. _Ansible inventory - hosts: https://git.fd.io/csit/tree/fdio.infra.ansible/inventories/lf_inventory/host_vars?h={release}
-.. _build logs from FD.io trex performance job 2n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-iterative-{srelease}-2n-aws
+.. _build logs from FD.io trex performance job 1n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-iterative-{srelease}-1n-aws
+.. _build logs from FD.io trex performance job 2n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-iterative-{srelease}-2n-icx
 .. _build logs from FD.io dpdk performance job 2n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-icx
 .. _build logs from FD.io dpdk performance job 3n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-3n-icx
 .. _build logs from FD.io dpdk performance job 2n-clx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-iterative-{srelease}-2n-clx
@@ -116,7 +117,8 @@ rst_epilog = """
 .. _build logs from FD.io dpdk coverage job 3n-tsh: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-3n-tsh
 .. _build logs from FD.io dpdk coverage job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-tx2
 .. _build logs from FD.io dpdk coverage job 2n-zn2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-dpdk-perf-report-coverage-{srelease}-2n-zn2
-.. _build logs from FD.io trex coverage job 2n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-coverage-{srelease}-2n-aws
+.. _build logs from FD.io trex coverage job 1n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-coverage-{srelease}-1n-aws
+.. _build logs from FD.io trex coverage job 2n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-trex-perf-report-coverage-{srelease}-2n-icx
 .. _build logs from FD.io vpp coverage job 3n-alt: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-alt
 .. _build logs from FD.io vpp coverage job 3n-tsh: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-tsh
 .. _build logs from FD.io vpp coverage job 2n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-2n-tx2
@@ -144,7 +146,7 @@ rst_epilog = """
            dpdk_prev_release='22.03',
            sdpdkrelease='22.07',
            trex_version='v3.00',
-           vpp_release_commit_id='0d352a97c5e3ad1f5f6eab18a978a14b0b9e06a8')
+           vpp_release_commit_id='07e0c05e698cf5ffd1e2d2de0296d1907519dc3d')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.