Merge branch 'main' into vs/tiffany-IT

vsangereanMOZ · web-flow · commit b7d1c3652e8b · 2025-08-06T14:34:59.000+03:00
diff --git a/.github/workflows/check-beta-l10n.yml b/.github/workflows/check-beta-l10n.yml
@@ -2,7 +2,7 @@ name: Check new beta version - L10N
 
 on:
   schedule:
-    - cron: "40 */1 * * *"
+    - cron: "21 */1 * * *"
 env:
   LATEST: ""
 permissions:
diff --git a/choose_l10n_ci_set.py b/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)
diff --git a/l10n_CM/constants/assos/GB/assos_ad.json b/l10n_CM/constants/assos/GB/assos_ad.json
@@ -0,0 +1,23 @@
+{
+  "url": "http://127.0.0.1:8080/assos_ad.html",
+  "field_mapping": {
+    "given_name": "7327e2ab-c813-41a0-914c-b6f499f20872",
+    "family_name": "be07f0e9-8e7b-4c50-9891-1ffd8421c0e4",
+    "address_level_2": "55a16b07-7c42-4b38-8bd6-d02640d46139",
+    "address_level_1": "48c17b5e-dc31-464b-83c2-fd8c9378508a",
+    "street_address" : "1b5887d6-7e78-4406-81f6-a8a269d279a3",
+    "postal_code": "517f152f-ceee-4fbd-9f41-d022b3596b09",
+    "telephone": "dd270ccb-e8ea-49ac-bfcd-a48bc225b535"
+
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "7327e2ab-c813-41a0-914c-b6f499f20872",
+    "be07f0e9-8e7b-4c50-9891-1ffd8421c0e4",
+    "55a16b07-7c42-4b38-8bd6-d02640d46139",
+    "48c17b5e-dc31-464b-83c2-fd8c9378508a",
+    "1b5887d6-7e78-4406-81f6-a8a269d279a3",
+    "517f152f-ceee-4fbd-9f41-d022b3596b09",
+    "dd270ccb-e8ea-49ac-bfcd-a48bc225b535"
+  ]
+}
diff --git a/l10n_CM/constants/assos/GB/assos_cc.json b/l10n_CM/constants/assos/GB/assos_cc.json
@@ -0,0 +1,18 @@
+{
+  "url": "http://127.0.0.1:8080/assos_cc.html",
+  "field_mapping": {
+    "card_number": "733a34b7-dee2-4117-8c2f-071b524132cc",
+    "expiration_date": "71861c8c-6842-40f3-8de5-0cca4cbbbd04",
+    "cvv": "87f69f19-0c97-4fe3-b0e9-67a9a0a8902f",
+    "given_name": "4f011f17-0752-4f0d-816f-e6b3c4576aaa",
+    "family_name": "ec81a5b7-c1a3-4f87-b139-514ceddbf070"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "733a34b7-dee2-4117-8c2f-071b524132cc",
+    "71861c8c-6842-40f3-8de5-0cca4cbbbd04",
+    "87f69f19-0c97-4fe3-b0e9-67a9a0a8902f",
+    "4f011f17-0752-4f0d-816f-e6b3c4576aaa",
+    "ec81a5b7-c1a3-4f87-b139-514ceddbf070"
+  ]
+}
diff --git a/l10n_CM/constants/burtsbees/CA/burtsbees_ad.json b/l10n_CM/constants/burtsbees/CA/burtsbees_ad.json
@@ -0,0 +1,20 @@
+{
+  "url": "http://127.0.0.1:8080/burtsbees_ad.html",
+  "field_mapping": {
+    "given_name": "484c9a5e-d921-4d8d-8006-45ba05e0f68a",
+    "family_name": "f5cade23-4cbf-47dd-8011-4979698b5d12",
+    "street_address": "5bad4ca0-fc9e-452c-a04c-1ffc66bd2024",
+    "address_level_2": "7a97a81e-44e2-40b0-a3ac-d8608463cd1e",
+    "postal_code": "95c16291-635f-4ed0-b18e-e733d36fcc83",
+    "telephone": "75d72d2e-61d0-415f-b51f-0ed1fe1d1922"
+  },
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "fields": [
+    "484c9a5e-d921-4d8d-8006-45ba05e0f68a",
+    "f5cade23-4cbf-47dd-8011-4979698b5d12",
+    "5bad4ca0-fc9e-452c-a04c-1ffc66bd2024",
+    "7a97a81e-44e2-40b0-a3ac-d8608463cd1e",
+    "95c16291-635f-4ed0-b18e-e733d36fcc83",
+    "75d72d2e-61d0-415f-b51f-0ed1fe1d1922"
+  ]
+}
diff --git a/l10n_CM/constants/burtsbees/CA/burtsbees_cc.json b/l10n_CM/constants/burtsbees/CA/burtsbees_cc.json
@@ -0,0 +1,15 @@
+{
+  "url": "http://127.0.0.1:8080/burtsbees_cc.html",
+  "field_mapping": {
+    "card_number": "39b722f9-ff49-4e30-a801-4a38945cc7e1",
+    "expiration_date": "57021e0e-6309-45b1-9c15-62cd56e1e930",
+    "cvv": "57021e0e-6309-45b1-9c15-62cd56e1e930"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "39b722f9-ff49-4e30-a801-4a38945cc7e1",
+    "57021e0e-6309-45b1-9c15-62cd56e1e930",
+    "57021e0e-6309-45b1-9c15-62cd56e1e930"
+]
+}
diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json
@@ -7,7 +7,8 @@
     "etsy",
     "newbalance",
     "canadatire",
-    "ebay"
+    "ebay",
+    "burtsbees"
   ],
   "tests": [
   ]
diff --git a/l10n_CM/region/GB.json b/l10n_CM/region/GB.json
@@ -5,7 +5,8 @@
     "demo",
     "peacocks",
     "whittard",
-    "diy"
+    "diy",
+    "assos"
   ],
   "tests": [
   ]
diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py
@@ -41,10 +41,12 @@
     "justspices",
     "yellowkorner",
     "bijoubrigitte",
+    "burtsbees",
     "peacocks",
     "whittard",
     "diy",
     "tiffany"
+    "assos",
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()
diff --git a/l10n_CM/sites/assos/GB/assos_ad.html b/l10n_CM/sites/assos/GB/assos_ad.html
diff --git a/l10n_CM/sites/assos/GB/assos_cc.html b/l10n_CM/sites/assos/GB/assos_cc.html
diff --git a/l10n_CM/sites/burtsbees/CA/burtsbees_ad.html b/l10n_CM/sites/burtsbees/CA/burtsbees_ad.html
diff --git a/l10n_CM/sites/burtsbees/CA/burtsbees_cc.html b/l10n_CM/sites/burtsbees/CA/burtsbees_cc.html
diff --git a/modules/browser_object_autofill_popup.py b/modules/browser_object_autofill_popup.py
@@ -1,3 +1,4 @@
+import logging
 from typing import Union
 
 from selenium.webdriver.remote.webelement import WebElement
@@ -45,7 +46,13 @@ def ensure_autofill_dropdown_visible(self, field_element: WebElement = None):
             field_element: if field element is given.
                 check whether it is a select element. pass the check if it is.
         """
-        self.element_visible("select-form-option")
+        self.element_exists("pop-up-component")
+        popup_component = self.get_element("pop-up-component")
+        logging.warning(
+            f"Parent pop up component: {len(popup_component.get_attribute('innerHTML')) > 1}"
+        )
+        if popup_component:
+            self.element_visible("select-form-option")
         return self
 
     # Interaction with popup elements
diff --git a/modules/testrail_integration.py b/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
@@ -19,7 +19,7 @@
 PLAN_NAME_RE = re.compile(r"\[(\w+) (\d+)\]")
 CONFIG_GROUP_ID = 95
 TESTRAIL_FX_DESK_PRJ = 17
-TC_EXECUTION_TEMPLATE = "https://firefox-ci-tc.services.mozilla.com/tasks/%TASK_ID%/runs/%RUN_ID%/logs/public/logs/live.log"
+TC_EXECUTION_TEMPLATE = "https://firefox-ci-tc.services.mozilla.com/tasks/%TASK_ID%/runs/%RUN_ID%/logs/live/public/logs/live.log"
 
 
 def get_execution_link() -> str:
@@ -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:
                 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
-                        )
+                        ):
+                            covered_mappings += 1
+                            report = False
         logging.warning(
             f"Potentially matching run found for {platform}, may be reportable. (Found {covered_mappings} site/region mappings reported.)"
         )
+        logging.warning(f"Run is reportable: {report}")
         # Only report when there is a new beta and no other site/region mappings are reported.
-        return covered_mappings == 0
+        return report
     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
