Merge branch 'main' of github.com:mozilla/fx-desktop-qa-automation

Author: ben-c-at-moz

choose_l10n_ci_set.py

@@ -1,6 +1,8 @@
 import json
+import logging
 import os
 import re
+import subprocess
 import sys
 from collections import defaultdict
 from subprocess import check_output
@@ -32,16 +34,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.
     """
-    for site, regions in mappings.items():
-        with open(OUTPUT_FILE, "a+") as f:
-            f.write(f"{site} {' '.join(regions)}\n")
+    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 = [defaultdict(set) for _ in range(3)]
+    for key, value in mappings.items():
+        min_idx = loads.index(min(loads))
+        containers[min_idx][key] = value
+        loads[min_idx] += len(value)
+    # get container index according to beta beta_version
+    run_idx = version % 3
+    return containers[run_idx]
 
 
 def process_changed_file(f, selected_mappings):
@@ -53,7 +67,6 @@ def process_changed_file(f, selected_mappings):
         selected_mappings: the selected mappings dictionary (updated in place).
     """
     split = f.split(SLASH)
-
     if f.startswith(os.path.join("l10n_CM", "sites")) or f.startswith(
         os.path.join("l10n_CM", "constants")
     ):
@@ -73,6 +86,23 @@ 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.
+    """
+    if not selected_container:
+        return
+    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:
@@ -83,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 = [
@@ -148,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:
@@ -352,12 +357,6 @@ def organize_l10n_entries(
     if len(site_entries) != 1:
         logging.info("Suite entries are broken somehow")
 
-    # Add execution link to plan description
-
-    os_name = config.split(" ")[0]
-    description = replace_link_in_description(expected_plan["description"], os_name)
-    testrail_session.update_plan(plan_id, description=description)
-
     # There should only be one entry per site per plan
     # Check that this entry has a run with the correct config
     # And if not, make that run
@@ -662,6 +661,12 @@ def collect_changes(testrail_session: TestRail, report):
         logging.info(f"Plan found ({expected_plan.get('id')}) but is completed.")
         return None
 
+    # Add execution link to plan description
+
+    os_name = config.split(" ")[0]
+    description = replace_link_in_description(expected_plan["description"], os_name)
+    testrail_session.update_plan(expected_plan["id"], description=description)
+
     # Find or add correct config for session
 
     config_matches = None