[intermittent commenter] add run counts in intermitent commenter

Author: ogiorgis

tests/intermittents_commenter/expected_comment.text

@@ -5,9 +5,9 @@ This is the #1 most frequent failure this week.
 * mozilla-central: 1
 
 ## Table
-| |**debug**|**no_variant**|**opt**|**spi-nw**|
-|---|:-:|:-:|:-:|:-:|
-|**macosx1015-x86_64/debug**| | | |1|
+| |**nb runs**|**debug**|**no_variant**|**opt**|**spi-nw**|
+|---|:-:|:-:|:-:|:-:|:-:|
+|**macosx1015-x86_64/debug**|22| | | |1|
 
 ## For more details, see:
 https://treeherder.mozilla.org/intermittent-failures/bugdetails?bug=1&startday=2022-05-09&endday=2025-05-10&tree=all

tests/intermittents_commenter/expected_comment_with_5_failures.text

@@ -5,12 +5,12 @@ This is the #1 most frequent failure this week.
 * mozilla-central: 5
 
 ## Table
-| |**asan**|**debug**|**headless**|**no_variant**|**opt**|**spi-nw**|**swr**|**tsan**|
-|---|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|**linux-x86/unknown build**| | |2| | | | | |
-|**linux1804-x86_64/debug**| | | | | |1| | |
-|**macosx1015-x86_64/debug**| | | | | |1| | |
-|**macosx1470-x86_64/debug**| | | | | | |1| |
+| |**nb runs**|**asan**|**debug**|**headless**|**no_variant**|**opt**|**spi-nw**|**swr**|**tsan**|
+|---|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|**linux-x86/unknown build**|0| | |2| | | | | |
+|**linux1804-x86_64/debug**|92| | | | | |1| | |
+|**macosx1015-x86_64/debug**|22| | | | | |1| | |
+|**macosx1470-x86_64/debug**|0| | | | | | |1| |
 
 ## For more details, see:
 https://treeherder.mozilla.org/intermittent-failures/bugdetails?bug=1&startday=2022-05-09&endday=2025-05-10&tree=all

treeherder/intermittents_commenter/comment.template

@@ -24,16 +24,16 @@ This is the #{{rank}} most frequent failure this week.{% endif %}
 * {{repository}}: {{count}}
 {% endfor %}
 ## Table
-| |
+| |**nb runs**|
 {%- for variant in test_variants -%}
   **{{variant}}**|
 {%- endfor %}
-|---|
+|---|:-:|
 {%- for variant in test_variants -%}
   :-:|
 {%- endfor %}
 {% for platform_and_build, test_by_variant in data_table.items() | sort() -%}
-|**{{platform_and_build}}**|
+|**{{platform_and_build}}**|{{test_by_variant.get('total_runs', " ")}}|
   {%- for variant in test_variants -%}
     {{test_by_variant.get(variant, " ")}}|
   {%- endfor %}

treeherder/intermittents_commenter/commenter.py

@@ -42,6 +42,8 @@ class BugRunInfo:
 
 @dataclass
 class BugsDetails:
+    test_name: str = ""
+    run_count: dict[str, int] = field(default_factory=dict)  # {job_name: run_count}
     total: int = 0
     test_variants: set = field(default_factory=set)
     per_repositories: dict[str, int] = field(default_factory=dict)  # {repo1: 1, repo2: 2, ...}
@@ -443,18 +445,27 @@ def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
         all_variants = set()
         for bug in bugs:
             bug_id = bug["bug__bugzilla_id"]
-            manifest = self.get_test_manifest(bug["bug__summary"])
-            task_labels = self.get_task_labels_and_count(manifest, start_day, end_day)
-            print(task_labels)
+            all_tests = self.get_tests_from_manifests()
+            test_name = self.get_test_name(all_tests, bug["bug__summary"])
+            manifest = None
             bug_testrun_matrix = []
-            if manifest:
-                testrun_matrix = (
-                    fetch.fetch_testrun_matrix()
-                    if self.testrun_matrix is None
-                    else self.testrun_matrix
-                )
-                self.testrun_matrix = testrun_matrix
-                bug_testrun_matrix = testrun_matrix[manifest]
+            run_count = 0
+            if test_name:
+                manifest = all_tests[test_name][0]
+                tasks_count = self.get_task_labels_and_count(manifest, start_day, end_day)
+                job_name = bug["job__signature__job_type_name"]
+                for task_name, count in tasks_count.items():
+                    if task_name in job_name:
+                        run_count = count
+                        break
+                if manifest:
+                    testrun_matrix = (
+                        fetch.fetch_testrun_matrix()
+                        if self.testrun_matrix is None
+                        else self.testrun_matrix
+                    )
+                    self.testrun_matrix = testrun_matrix
+                    bug_testrun_matrix = testrun_matrix[manifest]
             bug_run_info = self.get_bug_run_info(bug)
             all_variants = bug_run_info.variants
             if bug_testrun_matrix and bug_run_info.os_name in bug_testrun_matrix:
@@ -470,10 +481,14 @@ def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
                 platform_and_build = f"{bug_run_info.platform}/{bug_run_info.build_type}"
             if bug_id not in bug_map:
                 bug_infos = BugsDetails()
+                bug_infos.test_name = test_name
                 bug_infos.total = 1
                 bug_infos.test_variants |= all_variants
                 bug_infos.per_repositories[repo] = 1
-                bug_infos.data_table[platform_and_build] = {test_variant: 1}
+                bug_infos.data_table[platform_and_build] = {
+                    test_variant: 1,
+                    "total_runs": run_count,
+                }
                 bug_map[bug_id] = bug_infos
             else:
                 bug_infos = bug_map[bug_id]
@@ -485,6 +500,7 @@ def build_bug_map(self, bugs, option_collection_map, start_day, end_day):
                 data_table = bug_infos.data_table
                 platform_and_build_data = data_table.get(platform_and_build, {})
                 data_table[platform_and_build] = platform_and_build_data
+                data_table[platform_and_build]["total_runs"] = run_count
                 data_table[platform_and_build][test_variant] = (
                     platform_and_build_data.get(test_variant, 0) + 1
                 )
@@ -556,8 +572,7 @@ def fix_wpt_name(self, test_name):
         test_name = test_name.split("?")[0]
         return test_name
 
-    def get_test_manifest(self, summary):
-        all_tests = self.get_tests_from_manifests()
+    def get_test_name(self, all_tests, summary):
         tv_strings = [
             " TV ",
             " TV-nofis ",
@@ -620,7 +635,5 @@ def get_test_manifest(self, summary):
                     # 3) test has been deleted from the source tree
                     # 4) sometimes test was deleted but is valid on beta
                     return None
-            # matching test- we can access manifest
-            manifests = all_tests[test_name]
-            return manifests[0]
+            return test_name
         return None