From 82397b4141e65f03394edafedefc002771bba5b8 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 30 Jul 2019 13:21:52 +0200 Subject: [PATCH] Trending: Reduce input data Change-Id: I31d4d7ceaf8969e28d86deac2995cd38cbff9fca Signed-off-by: Tibor Frank --- resources/tools/presentation/pal.py | 86 +++++++++++----------- .../tools/presentation/specification_CPTA.yaml | 15 ++++ 2 files changed, 58 insertions(+), 43 deletions(-) diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py index dfed6b3e62..94742b07da 100644 --- a/resources/tools/presentation/pal.py +++ b/resources/tools/presentation/pal.py @@ -93,49 +93,49 @@ def main(): format(spec.output["output"])) 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=1) - - generate_tables(spec, data) - generate_plots(spec, data) - generate_files(spec, data) - - if spec.output["output"] == "report": - generate_report(args.release, spec, args.week) - logging.info("Successfully finished.") - elif spec.output["output"] == "CPTA": - sys.stdout.write(generate_cpta(spec, data)) - try: - alert = Alerting(spec) - alert.generate_alerts() - except AlertingError as err: - logging.warning(repr(err)) - 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 + # 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=1) + + generate_tables(spec, data) + generate_plots(spec, data) + generate_files(spec, data) + + if spec.output["output"] == "report": + generate_report(args.release, spec, args.week) + logging.info("Successfully finished.") + elif spec.output["output"] == "CPTA": + sys.stdout.write(generate_cpta(spec, data)) + try: + alert = Alerting(spec) + alert.generate_alerts() + except AlertingError as err: + logging.warning(repr(err)) + 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_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml index 5fba4d6d7b..5a3c7d69c9 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -172,6 +172,7 @@ start: 670 end: "lastCompletedBuild" skip: + - 672 - 673 - 674 - 675 @@ -223,6 +224,7 @@ start: 670 end: "lastCompletedBuild" skip: + - 672 - 673 - 674 - 675 @@ -409,6 +411,10 @@ - 532 - 533 - 534 + - 537 + - 538 + - 539 + - 540 - 546 - 547 - 548 @@ -452,6 +458,10 @@ - 532 - 533 - 534 + - 537 + - 538 + - 539 + - 540 - 546 - 547 - 548 @@ -567,6 +577,7 @@ start: 670 end: "lastCompletedBuild" skip: + - 672 - 673 - 674 - 675 @@ -695,6 +706,10 @@ - 532 - 533 - 534 + - 537 + - 538 + - 539 + - 540 - 546 - 547 - 548 -- 2.16.6