X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_alerts.py;h=da45d75891cfe1c0b8254baa9a2229b21078ddd8;hb=0df5beab9e8a1667f2885ed390046a71b2bc6e4f;hp=8e4f31e4cf820042c72ac9949f99f0a78643c5e5;hpb=dd36153562829ad84022cf5aa7746862c8f09156;p=csit.git diff --git a/resources/tools/presentation/generator_alerts.py b/resources/tools/presentation/generator_alerts.py index 8e4f31e4cf..da45d75891 100644 --- a/resources/tools/presentation/generator_alerts.py +++ b/resources/tools/presentation/generator_alerts.py @@ -348,17 +348,20 @@ class Alerting: text = u"" for idx, test_set in enumerate(alert.get(u"include", list())): + test_set_short = u"" + device = u"" try: - test_set_short = re.search( - re.compile(r'(\dn-(skx|clx|hsw|tsh|dnv)-.*)'), + groups = re.search( + re.compile(r'((vpp|dpdk)-\dn-(skx|clx|hsw|tsh|dnv)-.*)'), test_set - ).group(1) + ) + test_set_short = groups.group(1) + device = groups.group(2) except (AttributeError, IndexError): logging.error( f"The test set {test_set} does not include information " f"about test bed. Using empty string instead." ) - test_set_short = u"" build, version, passed, failed, failed_tests = \ self._get_compressed_failed_tests(alert, test_set) if build is None: @@ -376,7 +379,7 @@ class Alerting: text += ( f"\n\n{test_set_short}, {failed} tests failed, {passed} tests " f"passed, CSIT build: {alert[u'urls'][idx]}/{build}, " - f"VPP version: {version}\n\n" + f"{device} version: {version}\n\n" ) class MaxLens(): @@ -427,7 +430,7 @@ class Alerting: gression_hdr = ( f"\n\n{test_set_short}, " f"CSIT build: {alert[u'urls'][idx]}/{build}, " - f"VPP version: {version}\n\n" + f"{device} version: {version}\n\n" ) # Add list of regressions: self._list_gressions(alert, idx, gression_hdr, u"regressions")