aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-11-20 12:05:32 +0100
committerTibor Frank <tifrank@cisco.com>2018-11-20 14:01:11 +0000
commita933224daf27e5d48c53ff7120d60ef6d4591d86 (patch)
tree5dbcc44c345365e069fdcb9d2cd2af6dfd17a6dc /resources/tools
parent61abd1cf1ad1da569e033190b94a7dc0ea74ca80 (diff)
CSIT-1351: Add Denverton results to report
Change-Id: I0e92c183fe972ce9fe8e7b3d3fca6e6bb86ddd54 Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit 77175cdd458e9c9fa9020d73d2f0f0c9b6e7eeb6)
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/presentation/input_data_files.py10
-rw-r--r--resources/tools/presentation/pal.py78
-rw-r--r--resources/tools/presentation/specification.yaml95
3 files changed, 142 insertions, 41 deletions
diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py
index cde6d1acc4..da745ccdf9 100644
--- a/resources/tools/presentation/input_data_files.py
+++ b/resources/tools/presentation/input_data_files.py
@@ -16,6 +16,7 @@ Download all data.
"""
import re
+import logging
from os import rename, mkdir
from os.path import join
@@ -166,20 +167,29 @@ def download_and_unzip_data_file(spec, job, build, pid, log):
return False
elif job.startswith("hc2vpp-"):
url = spec.environment["urls"]["URL[JENKINS,HC]"]
+ elif job.startswith("intel-dnv-"):
+ url = spec.environment["urls"]["URL[VIRL,DNV]"]
else:
raise PresentationError("No url defined for the job '{}'.".
format(job))
file_name = spec.input["file-name"]
full_name = spec.input["download-path"]. \
format(job=job, build=build["build"], filename=file_name)
+ if job.startswith("intel-dnv-"):
+ full_name = ""
url = "{0}/{1}".format(url, full_name)
new_name = join(spec.environment["paths"]["DIR[WORKING,DATA]"],
"{job}{sep}{build}{sep}{name}".
format(job=job, sep=SEPARATOR, build=build["build"],
name=file_name))
+
+ logging.info(new_name)
+
# Download the file from the defined source (Jenkins, logs.fd.io):
success = _download_file(url, new_name, log)
+ logging.info("{}: {}".format(url, success))
+
if success and new_name.endswith(".zip"):
if not is_zipfile(new_name):
success = False
diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index 72493cb0d3..211f24d4d8 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -94,45 +94,45 @@ def main():
return 1
ret_code = 1
- try:
- env = Environment(spec.environment, args.force)
- env.set_environment()
-
- prepare_static_content(spec)
-
- data = InputData(spec)
- data.download_and_parse_data(repeat=2)
-
- generate_tables(spec, data)
- generate_plots(spec, data)
- generate_files(spec, data)
-
- if spec.output["output"] == "report":
- generate_report(args.release, spec, args.version)
- logging.info("Successfully finished.")
- elif spec.output["output"] == "CPTA":
- sys.stdout.write(generate_cpta(spec, data))
- alert = Alerting(spec)
- alert.generate_alerts()
- logging.info("Successfully finished.")
- ret_code = 0
-
- except AlertingError as err:
- logging.critical("Finished with an alerting error.")
- logging.critical(repr(err))
- except PresentationError as err:
- logging.critical("Finished with an PAL error.")
- logging.critical(repr(err))
- except (KeyError, ValueError) as err:
- logging.critical("Finished with an error.")
- logging.critical(repr(err))
- except Exception as err:
- logging.critical("Finished with an unexpected error.")
- logging.critical(repr(err))
- finally:
- if spec is not None:
- clean_environment(spec.environment)
- return ret_code
+ # try:
+ env = Environment(spec.environment, args.force)
+ env.set_environment()
+
+ prepare_static_content(spec)
+
+ data = InputData(spec)
+ data.download_and_parse_data(repeat=2)
+
+ generate_tables(spec, data)
+ generate_plots(spec, data)
+ generate_files(spec, data)
+
+ if spec.output["output"] == "report":
+ generate_report(args.release, spec, args.version)
+ logging.info("Successfully finished.")
+ elif spec.output["output"] == "CPTA":
+ sys.stdout.write(generate_cpta(spec, data))
+ alert = Alerting(spec)
+ alert.generate_alerts()
+ logging.info("Successfully finished.")
+ ret_code = 0
+
+ # except AlertingError as err:
+ # logging.critical("Finished with an alerting error.")
+ # logging.critical(repr(err))
+ # except PresentationError as err:
+ # logging.critical("Finished with an PAL error.")
+ # logging.critical(repr(err))
+ # except (KeyError, ValueError) as err:
+ # logging.critical("Finished with an error.")
+ # logging.critical(repr(err))
+ # except Exception as err:
+ # logging.critical("Finished with an unexpected error.")
+ # logging.critical(repr(err))
+ # finally:
+ # if spec is not None:
+ # clean_environment(spec.environment)
+ # return ret_code
if __name__ == '__main__':
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 918f28069e..eca0f43845 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -33,9 +33,11 @@
DIR[DTR,PERF,VPP,3N,HSW]: "{DIR[DTR]}/vpp_performance_results_3n_hsw"
DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
DIR[DTR,PERF,VPP,2N,SKX]: "{DIR[DTR]}/vpp_performance_results_2n_skx"
+ DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
DIR[DTR,MRR,VPP,3N,HSW]: "{DIR[DTR]}/vpp_mrr_results_3n_hsw"
DIR[DTR,MRR,VPP,3N,SKX]: "{DIR[DTR]}/vpp_mrr_results_3n_skx"
DIR[DTR,MRR,VPP,2N,SKX]: "{DIR[DTR]}/vpp_mrr_results_2n_skx"
+ DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
@@ -70,6 +72,7 @@
urls:
URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
+ URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/intel_denverton_vpp_release_1810.tar.gz"
URL[NEXUS]: "https://docs.fd.io/csit"
DIR[NEXUS]: "report/_static/archive"
@@ -118,6 +121,11 @@
data-sets:
+ # Denverton:
+ intel-dnv-vpp:
+ intel-dnv-vpp-release-1810:
+ - 1
+
# VPP Performance
vpp-performance-changes-3n-hsw:
csit-vpp-perf-1804-all:
@@ -1003,6 +1011,9 @@
builds:
+ intel-dnv-vpp-release-1810:
+ - 1
+
csit-vpp-perf-1804-all:
- 21 # sel
- 22 # sel
@@ -1264,8 +1275,8 @@
format:
html:
- full
- pdf:
- - minimal
+# pdf:
+# - minimal
################################################################################
### T A B L E S ###
@@ -2495,6 +2506,28 @@
- "parent"
- "msg"
+# Detailed Test Results - VPP Performance Results 2n-dnv
+-
+ type: "table"
+ title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+ algorithm: "table_merged_details"
+ output-file-ext: ".csv"
+ output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+ columns:
+ -
+ title: "Name"
+ data: "data name"
+ -
+ title: "Status"
+ data: "data msg"
+ rows: "generated"
+ data: "intel-dnv-vpp"
+ filter: "'NDRPDR'"
+ parameters:
+ - "name"
+ - "parent"
+ - "msg"
+
# Test configuration - VPP Performance Test Configs 3n-hsw
-
type: "table"
@@ -2693,6 +2726,28 @@
- "parent"
- "msg"
+# Detailed Test Results - VPP MRR Results 2n-dnv
+-
+ type: "table"
+ title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+ algorithm: "table_details"
+ output-file-ext: ".csv"
+ output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+ columns:
+ -
+ title: "Name"
+ data: "data name"
+ -
+ title: "Status"
+ data: "data msg"
+ rows: "generated"
+ data: "intel-dnv-vpp"
+ filter: "'MRR'"
+ parameters:
+ - "name"
+ - "parent"
+ - "msg"
+
# Test configuration - VPP MRR Test Configs 3n-hsw
-
type: "table"
@@ -3743,6 +3798,24 @@
- "parent"
data-start-level: 3
+# VPP Performance Results 2n-dnv
+-
+ type: "file"
+ title: "VPP Performance Results 2n-dnv"
+ algorithm: "file_test_results"
+ output-file-ext: ".rst"
+ output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+ file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n"
+ dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+ data: "intel-dnv-vpp"
+ filter: "'NDRPDR'"
+ parameters:
+ - "name"
+ - "doc"
+ - "level"
+ - "parent"
+ data-start-level: 3
+
# VPP Performance Configuration 3n-hsw
-
type: "file"
@@ -3905,6 +3978,24 @@
- "parent"
data-start-level: 3
+# VPP MRR Results 2n-dnv
+-
+ type: "file"
+ title: "VPP MRR Results 2n-dnv"
+ algorithm: "file_test_results"
+ output-file-ext: ".rst"
+ output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+ file-header: "\n.. |br| raw:: html\n\n <br />\n\n\n.. |prein| raw:: html\n\n <pre>\n\n\n.. |preout| raw:: html\n\n </pre>\n\n"
+ dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+ data: "intel-dnv-vpp"
+ filter: "all"
+ parameters:
+ - "name"
+ - "doc"
+ - "level"
+ - "parent"
+ data-start-level: 3
+
# VPP MRR Configuration 3n-hsw
-
type: "file"