when reporting, only report according to the split containers

Author: philimon-reset

choose_l10n_ci_set.py

@@ -35,48 +35,28 @@ def valid_l10n_mappings():
     return mapping
 
 
-def add_selected_mappings(mappings):
+def distribute_mappings_evenly(mappings, version):
     """
     Write the selected mappings to the output file.
 
     Args:
         mappings (dict): A dictionary of mappings, where the keys are sites and the values are sets of regions.
+        version (int): The beta_version of the beta.
     """
     if not mappings:
         return
     # sort the mappings by the length of the regions per site
     mappings = dict(sorted(mappings.items(), key=lambda val: len(val[1]), reverse=True))
     # place the mappings into 3 containers evenly according to the load
     loads = [0, 0, 0]
-    containers = [[] for _ in range(3)]
+    containers = [defaultdict(set) for _ in range(3)]
     for key, value in mappings.items():
         min_idx = loads.index(min(loads))
-        containers[min_idx].append(f"{key} {' '.join(value)}")
+        containers[min_idx][key] = value
         loads[min_idx] += len(value)
-    # shuffle the containers so each run for a beta is random.
-    random.shuffle(containers)
-    try:
-        version = int(
-            (
-                subprocess.check_output(
-                    [sys.executable, "./collect_executables.py", "-n"]
-                )
-                .strip()
-                .decode()
-            )
-            .split("-")[0]
-            .split(".")[1]
-            .split("b")[1]
-        )
-    except ValueError:
-        # failsafe version
-        version = 0
-    # get container index according to beta version
+    # get container index according to beta beta_version
     run_idx = version % 3
-    current_running_mappings = "\n".join(containers[run_idx])
-    logging.warning(f"Running the mappings:\n{current_running_mappings}")
-    with open(OUTPUT_FILE, "a+") as f:
-        f.write(f"{current_running_mappings}\n")
+    return containers[run_idx]
 
 
 def process_changed_file(f, selected_mappings):
@@ -107,6 +87,22 @@ def process_changed_file(f, selected_mappings):
                 selected_mappings[site].add(region)
 
 
+def save_mappings(selected_container):
+    """
+    Save the selected mappings to the output file.
+
+        Args:
+            selected_container: the selected mappings container.
+    """
+
+    current_running_mappings = [
+        f"{key} {' '.join(value)}\n" for key, value in selected_container.items()
+    ]
+    logging.warning(f"Running the mappings:\n{''.join(current_running_mappings)}")
+    with open(OUTPUT_FILE, "a+") as f:
+        f.writelines(current_running_mappings)
+
+
 if __name__ == "__main__":
     if os.path.exists(".env"):
         with open(".env") as fh:
@@ -117,11 +113,27 @@ def process_changed_file(f, selected_mappings):
                 os.environ["MANUAL"] = "true"
     with open(OUTPUT_FILE, "w") as file:
         pass  # File is created or cleared
+    try:
+        beta_version = int(
+            (
+                subprocess.check_output(
+                    [sys.executable, "./collect_executables.py", "-n"]
+                )
+                .strip()
+                .decode()
+            )
+            .split("-")[0]
+            .split(".")[1]
+            .split("b")[1]
+        )
+    except ValueError:
+        # failsafe beta_version
+        beta_version = 0
     l10n_mappings = valid_l10n_mappings()
     sample_mappings = {k: v for k, v in l10n_mappings.items() if k.startswith("demo")}
     if os.environ.get("TESTRAIL_REPORT") or os.environ.get("MANUAL"):
         # Run all tests if this is a scheduled beta or a manual run
-        add_selected_mappings(l10n_mappings)
+        save_mappings(distribute_mappings_evenly(l10n_mappings, beta_version))
         sys.exit(0)
 
     re_set_all = [
@@ -182,5 +194,5 @@ def process_changed_file(f, selected_mappings):
                 selected_mappings |= sample_mappings
                 break
 
-    add_selected_mappings(selected_mappings)
+    save_mappings(distribute_mappings_evenly(selected_mappings, beta_version))
     sys.exit(0)

modules/testrail_integration.py

@@ -4,7 +4,7 @@
 import subprocess
 import sys
 
-from choose_l10n_ci_set import valid_l10n_mappings
+from choose_l10n_ci_set import distribute_mappings_evenly, valid_l10n_mappings
 from modules import taskcluster as tc
 from modules import testrail as tr
 from modules.testrail import TestRail
@@ -187,26 +187,31 @@ def reportable(platform_to_test=None):
 
     plan_entries = this_plan.get("entries")
     if os.environ.get("FX_L10N"):
-        l10n_mappings = valid_l10n_mappings()
+        report = True
+        beta_version = int(minor_num.split("b")[-1])
+        distributed_mappings = distribute_mappings_evenly(
+            valid_l10n_mappings(), beta_version
+        )
         covered_mappings = 0
         # keeping this logic to still see how many mappings are reported.
         for entry in plan_entries:
-            if entry.get("name") in l10n_mappings:
+            if entry.get("name") in distributed_mappings:
+                report = False
                 site = entry.get("name")
                 for run_ in entry.get("runs"):
                     if run_.get("config"):
                         run_region, run_platform = run_.get("config").split("-")
                         covered_mappings += (
                             1
-                            if run_region in l10n_mappings[site]
+                            if run_region in distributed_mappings[site]
                             and platform in run_platform
                             else 0
                         )
         logging.warning(
             f"Potentially matching run found for {platform}, may be reportable. (Found {covered_mappings} site/region mappings reported.)"
         )
         # Only report when there is a new beta and no other site/region mappings are reported.
-        return covered_mappings == 0
+        return report or covered_mappings == 0
     else:
         covered_suites = 0
         for entry in plan_entries: