From 42fe666a56bb77efec0dd08268ee57e6482962d3 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Wed, 2 Jan 2019 09:49:01 +0100 Subject: Trending: Align the content of old and new dirs Change-Id: I39d1f71adac0bad3dbe18a987909904ea5c1e6cb Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_alerts.py | 10 ++++++++-- resources/tools/presentation/pal.py | 9 ++++++--- resources/tools/presentation/specification_CPTA.yaml | 14 +++++++------- 3 files changed, 21 insertions(+), 12 deletions(-) (limited to 'resources/tools/presentation') diff --git a/resources/tools/presentation/generator_alerts.py b/resources/tools/presentation/generator_alerts.py index cbdb1fd07b..83dfe2eb17 100644 --- a/resources/tools/presentation/generator_alerts.py +++ b/resources/tools/presentation/generator_alerts.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -70,7 +70,13 @@ class Alerting(object): # Implemented alerts: self._ALERTS = ("failed-tests", ) - self._spec = spec.alerting + try: + self._spec = spec.alerting + except KeyError as err: + raise AlertingError("Alerting is not configured, skipped.", + repr(err), + "WARNING") + self._path_failed_tests = spec.environment["paths"]["DIR[STATIC,VPP]"] # Verify and validate input specification: diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py index 5e419210aa..39cba09d96 100644 --- a/resources/tools/presentation/pal.py +++ b/resources/tools/presentation/pal.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -112,8 +112,11 @@ def main(): logging.info("Successfully finished.") elif spec.output["output"] == "CPTA": sys.stdout.write(generate_cpta(spec, data)) - alert = Alerting(spec) - alert.generate_alerts() + try: + alert = Alerting(spec) + alert.generate_alerts() + except AlertingError as err: + logging.warning(repr(err)) logging.info("Successfully finished.") ret_code = 0 diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml index 846fa712d3..45ea85c12c 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -140,20 +140,20 @@ # 3n-hsw plot-performance-trending-all-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 290 + start: 300 end: "lastCompletedBuild" csit-dpdk-perf-mrr-weekly-master: - start: 38 + start: 50 end: "lastCompletedBuild" plot-performance-trending-vpp-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 290 + start: 300 end: "lastCompletedBuild" plot-performance-trending-dpdk-3n-hsw: csit-dpdk-perf-mrr-weekly-master: - start: 38 + start: 50 end: "lastCompletedBuild" # 3n-skx @@ -282,10 +282,10 @@ # 3n-hsw csit-vpp-perf-mrr-daily-master: - start: 290 + start: 300 end: "lastCompletedBuild" csit-dpdk-perf-mrr-weekly-master: - start: 38 + start: 50 end: "lastCompletedBuild" # 3n-skx -- cgit 1.2.3-korg