X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_alerts.py;h=a71b775485703b8d17186cdbfaf0e957465f88ab;hb=ec79cd31fd974372fd6cd02be6a504dff6d50e8e;hp=da45d75891cfe1c0b8254baa9a2229b21078ddd8;hpb=0df5beab9e8a1667f2885ed390046a71b2bc6e4f;p=csit.git diff --git a/resources/tools/presentation/generator_alerts.py b/resources/tools/presentation/generator_alerts.py index da45d75891..a71b775485 100644 --- a/resources/tools/presentation/generator_alerts.py +++ b/resources/tools/presentation/generator_alerts.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -27,7 +27,6 @@ from email.mime.multipart import MIMEMultipart from os.path import isdir from collections import OrderedDict -from pal_utils import get_last_completed_build_number from pal_errors import PresentationError @@ -352,7 +351,9 @@ class Alerting: device = u"" try: groups = re.search( - re.compile(r'((vpp|dpdk)-\dn-(skx|clx|hsw|tsh|dnv)-.*)'), + re.compile( + r'((vpp|dpdk)-\dn-(skx|clx|hsw|tsh|dnv|zn2|tx2)-.*)' + ), test_set ) test_set_short = groups.group(1) @@ -365,14 +366,9 @@ class Alerting: build, version, passed, failed, failed_tests = \ self._get_compressed_failed_tests(alert, test_set) if build is None: - ret_code, build_nr, _ = get_last_completed_build_number( - self._spec.environment[u"urls"][u"URL[JENKINS,CSIT]"], - alert[u"urls"][idx].split(u'/')[-1]) - if ret_code != 0: - build_nr = u'' text += ( f"\n\nNo input data available for {test_set_short}. " - f"See CSIT build {alert[u'urls'][idx]}/{build_nr} for more " + f"See CSIT job {alert[u'urls'][idx]} for more " f"information.\n" ) continue