Report: Add vpp-device-1n-tx2

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: Ic0fb5fc3ba52524d8796ba4f47f36ea3992705be
(cherry picked from commit 72aba98d0d6325c34cc4412401f9020497688388)

14 files changed, 149 insertions, 56 deletions

diff --git a/docs/report/detailed_test_results/dpdk_performance_results/index.rst b/docs/report/detailed_test_results/dpdk_performance_results/index.rst
index d4d50f797d..2d04d1e405 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results/index.rst
@@ -10,7 +10,3 @@ DPDK Throughput
     ../dpdk_performance_results_3n_tsh/index
     ../dpdk_performance_results_2n_tx2/index
     ../dpdk_performance_results_3n_snr/index
-
-..
-    ../dpdk_performance_results_2n_dnv/index
-    ../dpdk_performance_results_3n_dnv/index
diff --git a/docs/report/detailed_test_results/vpp_device_results/index.rst b/docs/report/detailed_test_results/vpp_device_results/index.rst
new file mode 100644
index 0000000000..c8d8b6dcbd
--- /dev/null
+++ b/docs/report/detailed_test_results/vpp_device_results/index.rst
@@ -0,0 +1,6 @@
+VPP Device
+==========
+
+.. toctree::
+    ../vpp_device_results_1n_skx/index
+    ../vpp_device_results_1n_tx2/index
diff --git a/docs/report/detailed_test_results/vpp_device_results_1n_skx/index.rst b/docs/report/detailed_test_results/vpp_device_results_1n_skx/index.rst
new file mode 100644
index 0000000000..40c4082e74
--- /dev/null
+++ b/docs/report/detailed_test_results/vpp_device_results_1n_skx/index.rst
@@ -0,0 +1,12 @@
+1n-skx
+------
+
+.. note::
+
+    Data sources for reported test results:
+    i) `build logs from FD.io vpp device job 1n-skx`_,
+    ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
diff --git a/docs/report/detailed_test_results/vpp_device_results_1n_tx2/index.rst b/docs/report/detailed_test_results/vpp_device_results_1n_tx2/index.rst
new file mode 100644
index 0000000000..6983af6c29
--- /dev/null
+++ b/docs/report/detailed_test_results/vpp_device_results_1n_tx2/index.rst
@@ -0,0 +1,12 @@
+1n-tx2
+------
+
+.. note::
+
+    Data sources for reported test results:
+    i) `build logs from FD.io vpp device job 1n-tx2`_,
+    ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
diff --git a/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst b/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst
deleted file mode 100644
index 76d002acc6..0000000000
--- a/docs/report/detailed_test_results/vpp_device_results_ubuntu/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-VPP Device
-==========
-
-.. note::
-
-    Data sources for reported test results:
-    i) `build logs from FD.io vpp device jobs using Ubuntu`_,
-    ii) archived FD.io jobs test result
-    `output files <../../_static/archive/>`_.
-
-.. toctree::
-
diff --git a/docs/report/index.html.template b/docs/report/index.html.template
index af803266d2..50857ace19 100644
--- a/docs/report/index.html.template
+++ b/docs/report/index.html.template
@@ -70,7 +70,7 @@ CSIT-2302
     detailed_test_results/vpp_mrr_results/index
     detailed_test_results/dpdk_performance_results/index
     detailed_test_results/trex_performance_results/index
-    detailed_test_results/vpp_device_results_ubuntu/index
+    detailed_test_results/vpp_device_results/index
 
 .. toctree::
     :maxdepth: 2
@@ -78,7 +78,7 @@ CSIT-2302
 
     test_configuration/vpp_performance_configuration/index
     test_configuration/vpp_mrr_configuration/index
-    test_configuration/vpp_device_configuration_ubuntu/index
+    test_configuration/vpp_device_configuration/index
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/report/test_configuration/vpp_device_configuration/index.rst b/docs/report/test_configuration/vpp_device_configuration/index.rst
new file mode 100644
index 0000000000..30ef2b8726
--- /dev/null
+++ b/docs/report/test_configuration/vpp_device_configuration/index.rst
@@ -0,0 +1,6 @@
+VPP Device
+==========
+
+.. toctree::
+    ../vpp_device_configuration_1n_skx/index
+    ../vpp_device_configuration_1n_tx2/index
diff --git a/docs/report/test_configuration/vpp_device_configuration_1n_skx/index.rst b/docs/report/test_configuration/vpp_device_configuration_1n_skx/index.rst
new file mode 100644
index 0000000000..0a47cc7ff7
--- /dev/null
+++ b/docs/report/test_configuration/vpp_device_configuration_1n_skx/index.rst
@@ -0,0 +1,12 @@
+1n-skx
+------
+
+.. note::
+
+    Data sources for reported test configurations:
+    i) `build logs from FD.io vpp device job 1n-skx`_,
+    ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
diff --git a/docs/report/test_configuration/vpp_device_configuration_1n_tx2/index.rst b/docs/report/test_configuration/vpp_device_configuration_1n_tx2/index.rst
new file mode 100644
index 0000000000..dd1cfd5067
--- /dev/null
+++ b/docs/report/test_configuration/vpp_device_configuration_1n_tx2/index.rst
@@ -0,0 +1,12 @@
+1n-tx2
+------
+
+.. note::
+
+    Data sources for reported test configurations:
+    i) `build logs from FD.io vpp device job 1n-tx2`_,
+    ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
diff --git a/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst b/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst
deleted file mode 100644
index 81467048c5..0000000000
--- a/docs/report/test_configuration/vpp_device_configuration_ubuntu/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-VPP Device
-==========
-
-.. note::
-
-    Data sources for reported test configurations:
-    i) `build logs from FD.io vpp device jobs using Ubuntu`_,
-    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 91a1030ed4..0a15a5c7d8 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -4,10 +4,14 @@
 
 - type: "data-sets"
 
-  vpp-device-results-ubuntu:
+  vpp-device-1n-skx:
     csit-vpp-device-2302-ubuntu2204-x86_64-1n-skx:
       - 61  # 2302.rc2 VPP DEV env 11
 
+  vpp-device-1n-tx2:
+    csit-vpp-device-2302-ubuntu2204-aarch64-1n-tx2:
+      - 87  # 2302.rc2 VPP DEV env 11
+
 ################################################################################
 
   # TRex 2n-icx
@@ -882,7 +886,7 @@
       - 9   # 2302.rc2 NDRPDR iter env 11
       - 11  # 2302.rc2 NDRPDR iter env 11
       - 12  # 2302.rc2 NDRPDR iter env 11
-      # - 15  # 2302.rc2 NDRPDR iter env 11
+      - 15  # 2302.rc2 NDRPDR iter env 11
 
   vpp-3n-icx-curr-iter-best:
     csit-vpp-perf-report-iterative-2302-3n-icx:
@@ -931,6 +935,8 @@
       - 8   # 2302.rc2 hoststack iter env 11
       - 10  # 2302.rc2 hoststack iter env 11
       - 14  # 2302.rc2 hoststack iter env 11
+      - 17  # 2302.rc2 hoststack iter env 11
+      - 18  # 2302.rc2 hoststack iter env 11
 
   vpp-3n-icx-curr-cov:
     # csit-vpp-perf-report-coverage-2302-3n-icx:
@@ -1017,9 +1023,6 @@
     csit-vpp-perf-report-iterative-2302-3n-alt:
       - 5   # 2302.rc2 NDRPDR iter env 11
       - 6   # 2302.rc2 NDRPDR iter env 11
-      # - 7   # 2302.rc2 NDRPDR iter env 11
-      - 8   # 2302.rc2 NDRPDR iter env 11
-      - 9   # 2302.rc2 NDRPDR iter env 11
 
   vpp-3n-alt-curr-iter-best:
     csit-vpp-perf-report-iterative-2302-3n-alt:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 1ffa605906..4d0f87f44f 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -4308,17 +4308,17 @@
   - "name"
   - "conf-history"
 
-# Detailed Test Results - VPP Device Results - Ubuntu
+# Detailed Test Results - VPP Device Results - 1n-skx
 - type: "table"
-  title: "Detailed Test Results - VPP Device Results - Ubuntu"
+  title: "Detailed Test Results - VPP Device Results - 1n-skx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,1N,SKX]}/vpp_device_results_1n_skx"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| Status |preout| "
       data: "data status"
-  data: "vpp-device-results-ubuntu"
+  data: "vpp-device-1n-skx"
   filter: "all"
   parameters:
   - "name"
@@ -4326,17 +4326,52 @@
   - "doc"
   - "status"
 
-# Test configuration - VPP Device Test Configs - Ubuntu
+# Detailed Test Results - VPP Device Results - 1n-tx2
 - type: "table"
-  title: "Test configuration - VPP Device Test Configs - Ubuntu"
+  title: "Detailed Test Results - VPP Device Results - 1n-tx2"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,1N,TX2]}/vpp_device_results_1n_tx2"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Status |preout| "
+      data: "data status"
+  data: "vpp-device-1n-tx2"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
+# Test configuration - VPP Device Test Configs - 1n-skx
+- type: "table"
+  title: "Test configuration - VPP Device Test Configs - 1n-skx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,1N,SKX]}/vpp_device_configuration_1n_skx"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-device-results-ubuntu"
+  data: "vpp-device-1n-skx"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
+# Test configuration - VPP Device Test Configs - 1n-tx2
+- type: "table"
+  title: "Test configuration - VPP Device Test Configs - 1n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,1N,TX2]}/vpp_device_configuration_1n_tx2"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-device-1n-tx2"
   filter: "all"
   parameters:
   - "parent"
@@ -5423,23 +5458,43 @@
       - "vic1385"
       - "ena"
 
-# VPP Device Results - Ubuntu
+# VPP Device Results - 1n-skx
+- type: "file"
+  title: "VPP Device Results - 1n-skx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,1N,SKX]}"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,1N,SKX]}"
+  data: "vpp-device-1n-skx"
+  filter: "all"
+  data-start-level: 4
+
+# VPP Device Results - 1n-tx2
+- type: "file"
+  title: "VPP Device Results - 1n-tx2"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,1N,TX2]}"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,1N,TX2]}"
+  data: "vpp-device-1n-tx2"
+  filter: "all"
+  data-start-level: 4
+
+# VPP Device Configuration - 1n-skx
 - type: "file"
-  title: "VPP Device Results - Ubuntu"
+  title: "VPP Device Configuration - 1n-skx"
   algorithm: "file_test_results"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,1N,SKX]}"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,1N,SKX]}"
+  data: "vpp-device-1n-skx"
   filter: "all"
   data-start-level: 4
 
-# VPP Device Configuration - Ubuntu
+# VPP Device Configuration - 1n-tx2
 - type: "file"
-  title: "VPP Device Configuration - Ubuntu"
+  title: "VPP Device Configuration - 1n-tx2"
   algorithm: "file_test_results"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,1N,TX2]}"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,1N,TX2]}"
+  data: "vpp-device-1n-tx2"
   filter: "all"
   data-start-level: 4
 
diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml
index eb086b2d7c..736a904f0e 100644
--- a/resources/tools/presentation/specifications/report/environment.yaml
+++ b/resources/tools/presentation/specifications/report/environment.yaml
@@ -66,7 +66,8 @@
     DIR[DTR,MRR,VPP,2N,TX2]: "{DIR[DTR]}/vpp_mrr_results_2n_tx2"
     DIR[DTR,MRR,VPP,3N,SNR]: "{DIR[DTR]}/vpp_mrr_results_3n_snr"
     DIR[DTR,MRR,VPP,2N,AWS]: "{DIR[DTR]}/vpp_mrr_results_2n_aws"
-    DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu"
+    DIR[DTR,FUNC,VPP,DEVICE,1N,SKX]: "{DIR[DTR]}/vpp_device_results_1n_skx"
+    DIR[DTR,FUNC,VPP,DEVICE,1N,TX2]: "{DIR[DTR]}/vpp_device_results_1n_tx2"
 
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"
@@ -90,7 +91,8 @@
     DIR[DTC,MRR,VPP,2N,TX2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_tx2"
     DIR[DTC,MRR,VPP,3N,SNR]: "{DIR[DTC]}/vpp_mrr_configuration_3n_snr"
     DIR[DTC,MRR,VPP,2N,AWS]: "{DIR[DTC]}/vpp_mrr_configuration_2n_aws"
-    DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
+    DIR[DTC,FUNC,VPP,DEVICE,1N,SKX]: "{DIR[DTC]}/vpp_device_configuration_1n_skx"
+    DIR[DTC,FUNC,VPP,DEVICE,1N,TX2]: "{DIR[DTC]}/vpp_device_configuration_1n_tx2"
 
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
diff --git a/resources/tools/presentation/sphinx_conf/report/conf.py b/resources/tools/presentation/sphinx_conf/report/conf.py
index d2ce50b595..86d302c6b3 100644
--- a/resources/tools/presentation/sphinx_conf/report/conf.py
+++ b/resources/tools/presentation/sphinx_conf/report/conf.py
@@ -119,7 +119,8 @@ rst_epilog = """
 .. _build logs from FD.io vpp coverage job 3n-icx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-3n-icx
 .. _build logs from FD.io vpp coverage job 2n-zn2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-2n-zn2
 .. _build logs from FD.io vpp coverage job 2n-aws: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-perf-report-coverage-{srelease}-2n-aws
-.. _build logs from FD.io vpp device jobs using Ubuntu: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-device-{srelease}-ubuntu2004-1n-skx
+.. _build logs from FD.io vpp device job 1n-skx: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-device-{srelease}-ubuntu2204-1n-skx
+.. _build logs from FD.io vpp device job 1n-tx2: https://s3-logs.fd.io/vex-yul-rot-jenkins-1/csit-vpp-device-{srelease}-ubuntu2204-1n-tx2
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu2004-x86_64/
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/fdio.infra.ansible?h={release}
 .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id}