aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-04-10 12:16:04 +0200
committerTibor Frank <tifrank@cisco.com>2018-04-10 10:18:13 +0000
commit3e948845cfd37d1d1add886b0eb46a1be7aded6c (patch)
treea978625057512458dca4163c994559db9e17cded /resources
parent2b26def35d33799dc1f01d345bbfd1c8b6d5f3a8 (diff)
Fix: csv and txt tables
Change-Id: I2550bfbcecb3068b640fb4eda845a2b5dcc44a42 Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit ad874f031d54a032783ac9e8c921dc028592ff54)
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_CPTA.py7
-rw-r--r--resources/tools/presentation/pal.py82
2 files changed, 41 insertions, 48 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 4d52016db9..9195787b46 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -362,9 +362,7 @@ def _generate_all_charts(spec, input_data):
:type input_data: InputData
"""
- builds = spec.cpta["data"].values()[0]
job_name = spec.cpta["data"].keys()[0]
- # builds_lst = [str(build) for build in range(builds[0], builds[-1] + 1)]
builds_lst = list()
for build in spec.input["builds"][job_name]:
@@ -373,11 +371,6 @@ def _generate_all_charts(spec, input_data):
builds_lst.append(str(build["build"]))
print(builds_lst)
- # for build in range(builds[0], builds[-1] + 1):
- # status = spec.input["builds"][job_name][build]["status"]
- # if status != "failed" and status != "not found":
- # builds_lst.append(str(build))
-
# Get "build ID": "date" dict:
build_dates = dict()
for build in builds_lst:
diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index a43082df0b..98642c898c 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -87,48 +87,48 @@ def main():
return 1
ret_code = 0
- #try:
- env = Environment(spec.environment, args.force)
- env.set_environment()
-
- if spec.is_debug:
- if spec.debug["input-format"] == "zip":
- unzip_files(spec)
- else:
- download_data_files(spec)
-
- prepare_static_content(spec)
-
- data = InputData(spec)
- data.read_data()
-
- generate_tables(spec, data)
- generate_plots(spec, data)
- generate_files(spec, data)
-
- if spec.output["output"] == "report":
- generate_report(args.release, spec)
- logging.info("Successfully finished.")
- elif spec.output["output"] == "CPTA":
- sys.stdout.write(generate_cpta(spec, data))
- logging.info("Successfully finished.")
- else:
- logging.critical("The output '{0}' is not supported.".
- format(spec.output["output"]))
+ try:
+ env = Environment(spec.environment, args.force)
+ env.set_environment()
+
+ if spec.is_debug:
+ if spec.debug["input-format"] == "zip":
+ unzip_files(spec)
+ else:
+ download_data_files(spec)
+
+ prepare_static_content(spec)
+
+ data = InputData(spec)
+ data.read_data()
+
+ generate_tables(spec, data)
+ generate_plots(spec, data)
+ generate_files(spec, data)
+
+ if spec.output["output"] == "report":
+ generate_report(args.release, spec)
+ logging.info("Successfully finished.")
+ elif spec.output["output"] == "CPTA":
+ sys.stdout.write(generate_cpta(spec, data))
+ logging.info("Successfully finished.")
+ else:
+ logging.critical("The output '{0}' is not supported.".
+ format(spec.output["output"]))
+ ret_code = 1
+
+ except (KeyError, ValueError, PresentationError) as err:
+ logging.info("Finished with an error.")
+ logging.critical(str(err))
ret_code = 1
-
- # except (KeyError, ValueError, PresentationError) as err:
- # logging.info("Finished with an error.")
- # logging.critical(str(err))
- # ret_code = 1
- # except Exception as err:
- # logging.info("Finished with an unexpected error.")
- # logging.critical(str(err))
- # ret_code = 1
- # finally:
- # if spec is not None and not spec.is_debug:
- # clean_environment(spec.environment)
- # return ret_code
+ except Exception as err:
+ logging.info("Finished with an unexpected error.")
+ logging.critical(str(err))
+ ret_code = 1
+ finally:
+ if spec is not None and not spec.is_debug:
+ clean_environment(spec.environment)
+ return ret_code
if __name__ == '__main__':