CSIT-1212: Add 2n/3n-skx to Test Configuration

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

15 files changed, 226 insertions, 59 deletions

diff --git a/docs/report/index.rst b/docs/report/index.rst
index 0c652a265c..40602c114b 100644
--- a/docs/report/index.rst
+++ b/docs/report/index.rst
@@ -83,7 +83,6 @@ CSIT 18.07
         test_configuration/vpp_mrr_configuration/index
         test_configuration/cot_performance_configuration/index
         test_configuration/vpp_functional_configuration/index
-        test_configuration/vpp_functional_configuration_centos/index
 
     .. toctree::
         :maxdepth: 2
diff --git a/docs/report/test_configuration/cot_performance_configuration/index.rst b/docs/report/test_configuration/cot_performance_configuration/index.rst
index 7a19378e4b..3387691067 100644
--- a/docs/report/test_configuration/cot_performance_configuration/index.rst
+++ b/docs/report/test_configuration/cot_performance_configuration/index.rst
@@ -7,6 +7,6 @@ VPP K8s Container Memif
     functional jobs`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
-.. warning::
+.. note::
 
-    TODO: Add link to git directory with configuration files.
+    You can find the `K8s configuration files`_ in the GitHub.
diff --git a/docs/report/test_configuration/vpp_functional_configuration/index.rst b/docs/report/test_configuration/vpp_functional_configuration/index.rst
index e9176f56b0..93f4c5c40a 100644
--- a/docs/report/test_configuration/vpp_functional_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_functional_configuration/index.rst
@@ -1,12 +1,7 @@
-VPP Functional Ubuntu
-=====================
-
-.. note::
-
-    Data sources for reported test results: i) `FD.io test executor vpp
-    functional jobs`_, ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
+VPP Functional
+==============
 
 .. toctree::
 
-    vpp_functional_configuration
+    ../vpp_functional_configuration_ubuntu/index
+    ../vpp_functional_configuration_centos/index
diff --git a/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst b/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst
index 814e4cc4c8..f16812a095 100644
--- a/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst
+++ b/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst
@@ -1,5 +1,5 @@
-VPP Functional CentOS
-=====================
+CentOS
+------
 
 .. note::
 
diff --git a/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst b/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst
new file mode 100644
index 0000000000..f2d403b7e9
--- /dev/null
+++ b/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst
@@ -0,0 +1,12 @@
+Ubuntu
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    functional jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_functional_configuration_ubuntu
diff --git a/docs/report/test_configuration/vpp_mrr_configuration/index.rst b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
index 3629f22040..93cbbabfcc 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration/index.rst
@@ -1,12 +1,8 @@
 VPP Performance MRR
 ===================
 
-.. note::
-
-    Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
 .. toctree::
 
-    vpp_mrr_configuration
+    ../vpp_mrr_configuration_3n_hsw/index
+    ../vpp_mrr_configuration_3n_skx/index
+    ../vpp_mrr_configuration_2n_skx/index
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
new file mode 100644
index 0000000000..54c7dcd987
--- /dev/null
+++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
@@ -0,0 +1,12 @@
+2n-skx
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_mrr_configuration_2n_skx
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
new file mode 100644
index 0000000000..2db33f7d97
--- /dev/null
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
@@ -0,0 +1,12 @@
+3n-hsw
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_mrr_configuration_3n_hsw
diff --git a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
new file mode 100644
index 0000000000..36547c2a7c
--- /dev/null
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
@@ -0,0 +1,12 @@
+3n-skx
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_mrr_configuration_3n_skx
diff --git a/docs/report/test_configuration/vpp_performance_configuration/index.rst b/docs/report/test_configuration/vpp_performance_configuration/index.rst
index 2e72ca4713..45886daf58 100644
--- a/docs/report/test_configuration/vpp_performance_configuration/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration/index.rst
@@ -1,12 +1,8 @@
 VPP Performance NDR/PDR
 =======================
 
-.. note::
-
-    Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
-    <../../_static/archive/>`_.
-
 .. toctree::
 
-    vpp_performance_configuration
+    ../vpp_performance_configuration_3n_hsw/index
+    ../vpp_performance_configuration_3n_skx/index
+    ../vpp_performance_configuration_2n_skx/index
diff --git a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
new file mode 100644
index 0000000000..931d6ca48d
--- /dev/null
+++ b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
@@ -0,0 +1,12 @@
+2n-skx
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_performance_configuration_2n_skx
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
new file mode 100644
index 0000000000..fd970fef26
--- /dev/null
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
@@ -0,0 +1,12 @@
+3n-hsw
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_performance_configuration_3n_hsw
diff --git a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
new file mode 100644
index 0000000000..03aae765f1
--- /dev/null
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
@@ -0,0 +1,12 @@
+3n-skx
+------
+
+.. note::
+
+    Data sources for reported test results: i) `FD.io test executor vpp
+    performance jobs`_, ii) archived FD.io jobs test result `output files
+    <../../_static/archive/>`_.
+
+.. toctree::
+
+    vpp_performance_configuration_3n_skx
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index a30ee056d7..5544c29f80 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -93,6 +93,7 @@ rst_epilog = """
 .. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1604/
 .. _FD.io DPDK compile job: https://jenkins.fd.io/view/deb-dpdk/job/deb_dpdk-merge-{sdpdkrelease}-ubuntu1604/
 .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release}
+.. _K8s configuration files: https://github.com/FDio/csit/tree/{release}/resources/templates/kubernetes
 """.format(release='rls1807',
            prev_release='rls1804',
            srelease='1807',
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index cdc3ef5af2..35490e27b9 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -47,9 +47,13 @@
 
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"
-    DIR[DTC,PERF,VPP]: "{DIR[DTC]}/vpp_performance_configuration"
-    DIR[DTC,MRR,VPP]: "{DIR[DTC]}/vpp_mrr_configuration"
-    DIR[DTC,FUNC,VPP]: "{DIR[DTC]}/vpp_functional_configuration"
+    DIR[DTC,PERF,VPP,3N,HSW]: "{DIR[DTC]}/vpp_performance_configuration_3n_hsw"
+    DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
+    DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
+    DIR[DTC,MRR,VPP,3N,HSW]: "{DIR[DTC]}/vpp_mrr_configuration_3n_hsw"
+    DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
+    DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
+    DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
 
     # Detailed tests operational data
@@ -266,11 +270,11 @@
       - 25  # full
       - 49  # full
     vpp-func-results-ubuntu:
-      csit-vpp-functional-1804-ubuntu1604-virl:
-      - 229
+      csit-vpp-functional-1807-ubuntu1604-virl:
+      - "lastSuccessfulBuild"
     vpp-func-results-centos:
-      csit-vpp-functional-1804-centos7-virl:
-      - 238
+      csit-vpp-functional-1807-centos7-virl:
+      - "lastSuccessfulBuild"
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-check-1804:
       - 5   # mrr - full
@@ -291,16 +295,16 @@
       - 4  # full
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1807-3n-hsw:
-      - 2
+      - 6
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
-      - 3
+      - 6
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
-      - 9
+      - 10
     hc-func-results:
-      csit-hc2vpp-verify-func-1804-ubuntu1604:
-      - 3
+      csit-hc2vpp-verify-func-1807-ubuntu1604:
+      - "lastSuccessfulBuild"
     nsh-func-results:
       csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
       - 7
@@ -354,13 +358,17 @@
       - 35  # sel
     plot-dpdk-throughput-latency-3n-hsw:
       csit-dpdk-perf-verify-1807-3n-hsw:
-      - 1
       - 2
+      - 3
+      - 4
+      - 5
+      - 6
     plot-dpdk-throughput-latency-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
       - 2
       - 3
+      - 6
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
       - 1
@@ -372,6 +380,7 @@
       - 7
       - 8
       - 9
+      - 10
     plot-ligato-throughput-latency-3n-hsw:
       csit-ligato-perf-1804-all:
       - 5   # sel
@@ -739,12 +748,16 @@
     - 13  # sel
     - 14  # sel
     csit-dpdk-perf-verify-1807-3n-hsw:
-    - 1
     - 2
+    - 3
+    - 4
+    - 5
+    - 6
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1
     - 2
     - 3
+    - 6
     csit-dpdk-perf-verify-1807-2n-skx:
     - 1
     - 2
@@ -755,14 +768,15 @@
     - 7
     - 8
     - 9
-    csit-vpp-functional-1804-ubuntu1604-virl:
-    - 229
-    csit-vpp-functional-1804-centos7-virl:
-    - 238
+    - 10
+    csit-vpp-functional-1807-ubuntu1604-virl:
+    - "lastSuccessfulBuild"
+    csit-vpp-functional-1807-centos7-virl:
+    - "lastSuccessfulBuild"
     csit-nsh_sfc-verify-func-1804-ubuntu1604-virl:
     - 7
-    csit-hc2vpp-verify-func-1804-ubuntu1604:
-    - 3
+    csit-hc2vpp-verify-func-1807-ubuntu1604:
+    - "lastSuccessfulBuild"
 
 -
   type: "output"
@@ -1206,12 +1220,13 @@
   - "parent"
   - "doc"
   - "msg"
+
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs"
+  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP]}/vpp_test_configuration"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
   -
     title: "Name"
@@ -1220,8 +1235,49 @@
     title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
     data: "data vat-history"
   rows: "generated"
-  data:
-    "vpp-perf-results-3n-hsw"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+-
+  type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+-
+  type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-perf-results-2n-skx"
   filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
@@ -1327,10 +1383,10 @@
 
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs"
+  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP]}/vpp_mrr_test_configuration"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
   -
     title: "Name"
@@ -1339,8 +1395,49 @@
     title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
     data: "data vat-history"
   rows: "generated"
-  data:
-    "vpp-mrr-results-3n-hsw"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+-
+  type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+-
+  type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-mrr-results-2n-skx"
   filter: "'MRR'"
   parameters:
   - "parent"
@@ -1403,7 +1500,7 @@
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP]}/vpp_functional_configuration"
+  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
   columns:
   -
     title: "Name"
@@ -1433,8 +1530,7 @@
     title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
     data: "data vat-history"
   rows: "generated"
-  data:
-    "vpp-func-results-centos"
+  data: "vpp-func-results-centos"
   filter: "all"
   parameters:
   - "parent"