CSIT-1219: Update job definitions in conf.py

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

21 files changed, 49 insertions, 25 deletions

diff --git a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
index 17ea92b471..ff3ce5a99a 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor dpdk
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
index a917cfecb5..bb5021b180 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_hsw/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor dpdk
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
index ddafa8e310..1b8fc88681 100644
--- a/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/dpdk_performance_results_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor dpdk
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
index 7b2d9ffe99..5ac81c8bf0 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
index 68dc6efb1c..c7c96c3b53 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_hsw/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
index e60c4296de..fc62696034 100644
--- a/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_mrr_results_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
index 99984f1be9..f3a5f81465 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
index 1563a12b72..2f258a588f 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_hsw/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst b/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
index 4f4f5885b8..7b43ec2aef 100644
--- a/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
+++ b/docs/report/detailed_test_results/vpp_performance_results_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index 54c7dcd987..1df3bb374c 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index 2db33f7d97..2e0c701b82 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_hsw/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index 36547c2a7c..38c77bc9c8 100644
--- a/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_mrr_configuration_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index 931d6ca48d..c468270e1a 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index fd970fef26..3e5b09f641 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_hsw/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
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
index 03aae765f1..76c2a9edb6 100644
--- a/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
+++ b/docs/report/test_configuration/vpp_performance_configuration_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
index 3b3692c812..e363e0376c 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_2n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 2n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
index 33ad7e4426..530cf853b4 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_hsw/index.rst
@@ -1,10 +1,10 @@
-2n-hsw
+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
+    performance job 3n-hsw`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst b/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
index 743436e659..c82e2c1906 100644
--- a/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
+++ b/docs/report/test_operational_data/vpp_performance_operational_data_3n_skx/index.rst
@@ -4,7 +4,7 @@
 .. note::
 
     Data sources for reported test results: i) `FD.io test executor vpp
-    performance jobs`_, ii) archived FD.io jobs test result `output files
+    performance job 3n-skx`_, ii) archived FD.io jobs test result `output files
     <../../_static/archive/>`_.
 
 .. toctree::
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 25d5b714a4..26d291400a 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -84,10 +84,14 @@ rst_epilog = """
 .. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.html
 .. _CSIT NSH_SFC Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.nsh_sfc.func.html
 .. _VPP test framework documentation: https://docs.fd.io/vpp/{vpprelease}/vpp_make_test/html/
-.. _FD.io test executor vpp performance jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-{srelease}-all
+.. _FD.io test executor dpdk performance job 3n-hsw: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-3n-hsw
+.. _FD.io test executor dpdk performance job 3n-skx: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-3n-skx
+.. _FD.io test executor dpdk performance job 2n-skx: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-2n-skx
+.. _FD.io test executor vpp performance job 3n-hsw: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-1807-3n-hsw
+.. _FD.io test executor vpp performance job 3n-skx: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-1807-3n-skx
+.. _FD.io test executor vpp performance job 2n-skx: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-1807-2n-skx
 .. _FD.io test executor ligato performance jobs: https://jenkins.fd.io/job/csit-ligato-perf-{srelease}-all
 .. _FD.io test executor vpp functional jobs: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-{srelease}-ubuntu1604-virl/lastSuccessfulBuild
-.. _FD.io test executor dpdk performance jobs: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-{srelease}-all
 .. _FD.io test executor Honeycomb functional jobs: https://jenkins.fd.io/view/csit/job/hc2vpp-csit-integration-{srelease}-ubuntu1604/lastSuccessfulBuild
 .. _FD.io test executor honeycomb performance jobs: https://jenkins.fd.io/view/hc2vpp/job/hc2vpp-csit-perf-master-ubuntu1604/lastSuccessfulBuild
 .. _FD.io test executor NSH_SFC functional jobs: https://jenkins.fd.io/view/csit/job/csit-nsh_sfc-verify-func-{srelease}-ubuntu1604-virl/lastSuccessfulBuild
diff --git a/resources/tools/presentation/generator_report.py b/resources/tools/presentation/generator_report.py
index 1618532e05..287d0782b0 100644
--- a/resources/tools/presentation/generator_report.py
+++ b/resources/tools/presentation/generator_report.py
@@ -214,7 +214,8 @@ def generate_pdf_report(release, spec, versions, report_version):
         'pdflatex -interaction nonstopmode csit.tex || true'.
         format(build_dir=build_dir),
         'cd {build_dir} && '
-        'cp csit.pdf ../{archive_dir}/csit_{release}_v{report_version}.pdf'.
+        'cp csit.pdf ../{archive_dir}/csit_{release}_v{report_version}.pdf &&'
+        'cp csit.pdf ../{archive_dir}/csit_{release}.pdf'.
         format(build_dir=build_dir,
                archive_dir=archive_dir,
                release=release,
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1f9ea61816..ade101d1b3 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -295,10 +295,10 @@
       - 4  # full
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1807-3n-hsw:
-      - 6
+      - 10
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
-      - 6
+      - 12
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
       - 10
@@ -363,12 +363,21 @@
       - 4
       - 5
       - 6
-    plot-dpdk-throughput-latency-3n-skx:
+      - 7
+      - 8
+      - 9
+      - 10
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
       - 2
       - 3
       - 6
+      - 7
+      - 8
+      - 9
+      - 10
+      - 11
+      - 12
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1807-2n-skx:
       - 1
@@ -753,11 +762,21 @@
     - 4
     - 5
     - 6
+    - 7
+    - 8
+    - 9
+    - 10
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1
     - 2
     - 3
     - 6
+    - 7
+    - 8
+    - 9
+    - 10
+    - 11
+    - 12
     csit-dpdk-perf-verify-1807-2n-skx:
     - 1
     - 2