From 762c67cae040358876e470822ad50a77d4f03c12 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 9 Dec 2019 11:21:37 +0100 Subject: [PATCH] Trending: Fix Alerts Change-Id: I963022c386928b7f29b176bfb4a4e2bfb0a55409 Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_alerts.py | 2 +- resources/tools/presentation/input_data_parser.py | 6 ++- .../tools/presentation/specification_CPTA.yaml | 47 +++++++++------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/resources/tools/presentation/generator_alerts.py b/resources/tools/presentation/generator_alerts.py index 10c6734aad..b0606b6fd7 100644 --- a/resources/tools/presentation/generator_alerts.py +++ b/resources/tools/presentation/generator_alerts.py @@ -314,7 +314,7 @@ class Alerting: in_file = ( f"{self.configs[alert[u'way']][u'output-dir']}/" - f"cpta-{re_pro}-{alert[u'urls'][idx].split(u'/')[-1]}.txt" + f"{re_pro}-{alert[u'urls'][idx].split(u'/')[-1]}.txt" ) out_file = ( f"{self.configs[alert[u'way']][u'output-dir']}/" diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index af8a854ce9..d23fa8454d 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -452,10 +452,12 @@ class ExecutionChecker(ResultVisitor): host = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message). group(1)) except (AttributeError, IndexError): - host = u"" + host = self._data[u"tests"][self._test_id][u"show-run"].\ + count(u"DUT:") + 1 try: socket = str(re.search(self.REGEX_TC_PAPI_CLI, msg.message). group(2)) + socket = f"/{socket}" except (AttributeError, IndexError): socket = u"" runtime = loads( @@ -526,7 +528,7 @@ class ExecutionChecker(ResultVisitor): txt_table.align[u"Vectors/Calls"] = u"r" text += txt_table.get_string(sortby=u"Name") + u'\n' - text = f" \n **DUT: {host}/{socket}** \n {text}".\ + text = f" \n**DUT: {host}{socket}**\n{text}".\ replace(u'\n', u' |br| ').\ replace(u'\r', u'').\ replace(u'"', u"'") diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml index c52270146d..ac7fb5d402 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -196,10 +196,9 @@ # 3n-hsw plot-performance-trending-all-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 851 + start: 853 end: "lastCompletedBuild" skip: - - 852 - 855 - 856 - 860 @@ -232,10 +231,9 @@ plot-performance-trending-vpp-3n-hsw: csit-vpp-perf-mrr-daily-master: - start: 851 + start: 853 end: "lastCompletedBuild" skip: - - 852 - 855 - 856 - 860 @@ -271,11 +269,9 @@ # 3n-skx plot-performance-trending-all-3n-skx: csit-vpp-perf-mrr-daily-master-3n-skx: - start: 598 + start: 602 end: "lastCompletedBuild" skip: - - 600 - - 601 - 603 - 604 - 612 @@ -299,6 +295,7 @@ - 696 - 697 - 705 + - 743 csit-dpdk-perf-mrr-weekly-master-3n-skx: start: 57 end: "lastCompletedBuild" @@ -307,11 +304,9 @@ plot-performance-trending-vpp-3n-skx: csit-vpp-perf-mrr-daily-master-3n-skx: - start: 598 + start: 602 end: "lastCompletedBuild" skip: - - 600 - - 601 - 603 - 604 - 612 @@ -335,6 +330,7 @@ - 696 - 697 - 705 + - 743 plot-performance-trending-dpdk-3n-skx: csit-dpdk-perf-mrr-weekly-master-3n-skx: @@ -346,7 +342,7 @@ # 2n-skx plot-performance-trending-all-2n-skx: csit-vpp-perf-mrr-daily-master-2n-skx: - start: 606 + start: 607 end: "lastCompletedBuild" skip: - 608 @@ -374,6 +370,7 @@ - 700 - 701 - 702 + - 768 csit-dpdk-perf-mrr-weekly-master-2n-skx: start: 57 end: "lastCompletedBuild" @@ -383,7 +380,7 @@ plot-performance-trending-vpp-2n-skx: csit-vpp-perf-mrr-daily-master-2n-skx: - start: 606 + start: 607 end: "lastCompletedBuild" skip: - 608 @@ -411,6 +408,7 @@ - 700 - 701 - 702 + - 768 plot-performance-trending-vpp-2n-clx: csit-vpp-perf-mrr-daily-master-2n-clx: @@ -452,10 +450,9 @@ plot-performance-trending-vpp-3n-dnv: csit-vpp-perf-mrr-daily-master-3n-dnv: - start: 79 + start: 82 end: "lastCompletedBuild" skip: - - 80 - 83 - 84 - 91 @@ -504,11 +501,9 @@ plot-performance-trending-vpp-2n-dnv: csit-vpp-perf-mrr-daily-master-2n-dnv: - start: 78 + start: 81 end: "lastCompletedBuild" skip: - - 79 - - 80 - 83 - 90 - 91 @@ -649,10 +644,9 @@ # 3n-hsw csit-vpp-perf-mrr-daily-master: - start: 851 + start: 853 end: "lastCompletedBuild" skip: - - 852 - 855 - 856 - 860 @@ -685,11 +679,9 @@ # 3n-skx csit-vpp-perf-mrr-daily-master-3n-skx: - start: 598 + start: 602 end: "lastCompletedBuild" skip: - - 600 - - 601 - 603 - 604 - 612 @@ -713,6 +705,7 @@ - 696 - 697 - 705 + - 743 csit-dpdk-perf-mrr-weekly-master-3n-skx: start: 57 end: "lastCompletedBuild" @@ -721,7 +714,7 @@ # 2n-skx csit-vpp-perf-mrr-daily-master-2n-skx: - start: 606 + start: 607 end: "lastCompletedBuild" skip: - 608 @@ -749,6 +742,7 @@ - 700 - 701 - 702 + - 768 csit-vpp-perf-mrr-weekly-master-2n-skx: start: 30 end: "lastCompletedBuild" @@ -777,10 +771,9 @@ # 3n-dnv csit-vpp-perf-mrr-daily-master-3n-dnv: - start: 79 + start: 82 end: "lastCompletedBuild" skip: - - 80 - 83 - 84 - 91 @@ -829,11 +822,9 @@ # 2n-dnv csit-vpp-perf-mrr-daily-master-2n-dnv: - start: 78 + start: 81 end: "lastCompletedBuild" skip: - - 79 - - 80 - 83 - 90 - 91 -- 2.16.6