X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_alerts.py;h=156e99ccc00b72464b0c9bb3a8305d3a3fa4df35;hp=8e4f31e4cf820042c72ac9949f99f0a78643c5e5;hb=610e96a2afae5c8e58bee00d05c45d57d7bb6021;hpb=dd36153562829ad84022cf5aa7746862c8f09156

diff --git a/resources/tools/presentation/generator_alerts.py b/resources/tools/presentation/generator_alerts.py
index 8e4f31e4cf..156e99ccc0 100644
--- a/resources/tools/presentation/generator_alerts.py
+++ b/resources/tools/presentation/generator_alerts.py
@@ -348,35 +348,35 @@ 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|zn2)-.*)'
+                    ),
                     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:
-                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
             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 +427,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")