From 6f725c52429e697e1d03ebccc72a443ac3655298 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 30 Jul 2019 15:19:18 +0200 Subject: [PATCH] Trending: Reduce input data Change-Id: Idd87da996f25c7fd94cef828dee6967737b73ba8 Signed-off-by: Tibor Frank --- resources/tools/presentation/pal.py | 86 ++++++------ .../tools/presentation/specification_CPTA.yaml | 154 ++++++++++----------- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py index 94742b07da..dfed6b3e62 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 a387645403..978a8224b2 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -169,7 +169,7 @@ # 3n-hsw plot-performance-trending-all-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 700 + start: 720 end: "lastCompletedBuild" skip: # - 672 @@ -225,7 +225,7 @@ plot-performance-trending-vpp-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 700 + start: 720 end: "lastCompletedBuild" skip: # - 672 @@ -284,20 +284,20 @@ # 3n-skx plot-performance-trending-all-3n-skx: csit-vpp-perf-mrr-daily-master-3n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 440 - - 444 - - 446 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 440 +# - 444 +# - 446 - 480 - 481 - 499 @@ -336,20 +336,20 @@ plot-performance-trending-vpp-3n-skx: csit-vpp-perf-mrr-daily-master-3n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 440 - - 444 - - 446 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 440 +# - 444 +# - 446 - 480 - 481 - 499 @@ -391,20 +391,20 @@ # 2n-skx plot-performance-trending-all-2n-skx: csit-vpp-perf-mrr-daily-master-2n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 431 - - 441 - - 444 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 431 +# - 441 +# - 444 - 477 - 500 - 501 @@ -438,20 +438,20 @@ plot-performance-trending-vpp-2n-skx: csit-vpp-perf-mrr-daily-master-2n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 431 - - 441 - - 444 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 431 +# - 441 +# - 444 - 477 - 500 - 501 @@ -487,7 +487,7 @@ plot-performance-trending-vpp-nfv-2n-skx: csit-vpp-perf-mrr-weekly-master-2n-skx: - start: 15 + start: 16 end: "lastCompletedBuild" skip: - 21 @@ -582,7 +582,7 @@ # 3n-hsw csit-vpp-perf-mrr-daily-master: - start: 700 + start: 720 end: "lastCompletedBuild" skip: # - 672 @@ -638,20 +638,20 @@ # 3n-skx csit-vpp-perf-mrr-daily-master-3n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 440 - - 444 - - 446 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 440 +# - 444 +# - 446 - 480 - 481 - 499 @@ -694,20 +694,20 @@ # 2n-skx csit-vpp-perf-mrr-daily-master-2n-skx: - start: 420 + start: 450 end: "lastCompletedBuild" skip: - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 431 - - 441 - - 444 +# - 423 +# - 424 +# - 425 +# - 426 +# - 427 +# - 428 +# - 429 +# - 430 +# - 431 +# - 441 +# - 444 - 477 - 500 - 501 @@ -734,7 +734,7 @@ - 556 - 557 csit-vpp-perf-mrr-weekly-master-2n-skx: - start: 15 + start: 16 end: "lastCompletedBuild" skip: - 21 -- 2.16.6