From da39bb7cabae2ded535a974901a59d6191063c79 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Mon, 30 Jul 2018 08:27:24 +0200
Subject: CSIT-1219: Update job definitions in conf.py

Change-Id: Ib7e76f43a8ef2d4729962ff5856c987747b0b953
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/conf.py             |  8 ++++++--
 resources/tools/presentation/generator_report.py |  3 ++-
 resources/tools/presentation/specification.yaml  | 25 +++++++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

(limited to 'resources/tools/presentation')

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
-- 
cgit 1.2.3-korg