CSIT-891: Add data sources for 1801 report

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

4 files changed, 48 insertions, 45 deletions

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
index c163960600..50074e1b6a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/index.rst
@@ -20,7 +20,7 @@ TGint2-to-SUT2-to-SUT1-to-TGint1.
 
     Test results have been generated by
     `FD.io test executor vpp performance jobs`_ with Robot Framework result
-    files csit-vpp-perf-|release|-\*.zip `archived here <../../_static/archive/>`_.
+    files csit-vpp-perf-|srelease|-\*.zip `archived here <../../_static/archive/>`_.
 
 .. toctree::
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index 2539521c69..63af4d628f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -30,7 +30,7 @@ and their indices.
 
     Test results have been generated by
     `FD.io test executor vpp performance jobs`_ with Robot Framework result
-    files csit-vpp-perf-|release|-\*.zip `archived here <../../_static/archive/>`_.
+    files csit-vpp-perf-|srelease|-\*.zip `archived here <../../_static/archive/>`_.
     Plotted data set size per test case is equal to the number of job executions
     presented in this report version: **8**.
 
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 8c266c21c7..4d6c96d83d 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -59,6 +59,7 @@ author = u'FD.io CSIT'
 
 rst_epilog = """
 .. |release-1| replace:: rls1710
+.. |srelease| replace:: {srelease}
 .. |vpp-release| replace:: VPP-{vpprelease} release
 .. |vpp-release-1| replace:: VPP-17.10 release
 .. |dpdk-release| replace:: DPDK 17.11
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index bf149bcd46..0e8a51f236 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -93,6 +93,7 @@
     plot-vpp-http-server-performance:
       csit-vpp-perf-1801-all:
       - 157
+      - 158
 # TODO: Add the data sources
 #    vpp-meltdown-impact:
 #      csit-vpp-perf-1707-all:
@@ -527,6 +528,7 @@
     - 145  # sel
     - 146  # sel
     - 157  # wrk
+    - 158  # wrk
     csit-ligato-perf-1710-all:
     - 5
     - 7
@@ -1141,49 +1143,49 @@
 ################################################################################
 
 # Plots VPP HTTP Server Performance
-#-
-#  type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-#  # each tag is enclosed with ' (apostrophe).
-#  filter: "'HTTP' and 'TCP_CPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-cps"
-#
-#-
-#  type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_RPS'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-rps"
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+  data:
+    "plot-vpp-http-server-performance"
+  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+  # each tag is enclosed with ' (apostrophe).
+  filter: "'HTTP' and 'TCP_CPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-cps"
+
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+  data:
+    "plot-vpp-http-server-performance"
+  filter: "'HTTP' and 'TCP_RPS'"
+  parameters:
+  - "result"
+  - "name"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-rps"
 
 # Plot Throughput Speedup Analysis