Merge main

Author: soncuteanca

l10n_CM/constants/whittard/GB/whittard_ad.json

@@ -0,0 +1,25 @@
+{
+  "url": "http://127.0.0.1:8080/whittard_ad.html",
+  "field_mapping": {
+    "given_name": "28187127-a9d5-41fc-ad29-422d4386dc6f",
+    "family_name": "7f521e28-34c7-4b61-9222-b9faa2d4ce95",
+    "street_address": "5625975f-1ca8-4632-8c66-52c490e87a02",
+    "address_level_2": "68ae7843-fd19-4c76-b2c4-c0b488f977a2",
+    "country": "7b1e5bca-1ef1-4e22-82ea-d56c435925fe",
+    "postal_code": "7d9b7aec-75c2-4314-97a0-483255b0f978",
+    "telephone": "9db0d3e3-54bf-4544-b190-3aed129d05c9",
+    "email": "5f649f14-02ea-42a9-9937-c82e1b3a6372"
+  },
+
+  "form_field": "*[data-moz-autofill-inspect-id='{given_name}']",
+  "fields": [
+    "28187127-a9d5-41fc-ad29-422d4386dc6f",
+    "7f521e28-34c7-4b61-9222-b9faa2d4ce95",
+    "5625975f-1ca8-4632-8c66-52c490e87a02",
+    "68ae7843-fd19-4c76-b2c4-c0b488f977a2",
+    "7b1e5bca-1ef1-4e22-82ea-d56c435925fe",
+    "7d9b7aec-75c2-4314-97a0-483255b0f978",
+    "9db0d3e3-54bf-4544-b190-3aed129d05c9",
+    "5f649f14-02ea-42a9-9937-c82e1b3a6372"
+  ]
+}

l10n_CM/constants/whittard/GB/whittard_cc.json

@@ -0,0 +1,19 @@
+{
+  "url": "http://127.0.0.1:8080/whittard_cc.html",
+  "field_mapping": {
+    "card_name": "6e32bfc1-3e4d-4d3b-90c1-a079316bb378",
+    "card_number": "cf035d07-1eb9-4efe-ad91-2ed125c685be",
+    "expiration_month": "1c5508ad-3599-410f-9853-1ec898d759d4",
+    "expiration_year": "a4f54662-6c32-49cb-97ab-2ef2430a4f50",
+    "cvv": "f4020ed8-6221-4359-ac0a-3dff8bc30282"
+},
+  "form_field": "*[data-moz-autofill-inspect-id='{name}']",
+  "skip": "True",
+  "fields": [
+    "6e32bfc1-3e4d-4d3b-90c1-a079316bb378",
+    "cf035d07-1eb9-4efe-ad91-2ed125c685be",
+    "1c5508ad-3599-410f-9853-1ec898d759d4",
+    "a4f54662-6c32-49cb-97ab-2ef2430a4f50",
+    "f4020ed8-6221-4359-ac0a-3dff8bc30282"
+]
+}

l10n_CM/region/GB.json

@@ -2,7 +2,8 @@
   "region": "GB",
   "sites": [
     "ebay",
-    "demo"
+    "demo",
+    "whittard"
   ],
   "tests": [
   ]

l10n_CM/run_l10n.py

@@ -41,6 +41,7 @@
     "yellowkorner",
     "wish",
     "bijoubrigitte",
+    "whittard",
 }
 
 loaded_valid_sites = valid_l10n_mappings().keys()

l10n_CM/sites/whittard/GB/whittard_ad.html

@@ -350,6 +350,18 @@ def create_new_plan_entry(
             payload["runs"] = runs
         return self.client.send_post(f"/add_plan_entry/{plan_id}", payload)
 
+    def update_plan(self, plan_id, **kwargs):
+        """Given a plan id, update the plan per kwargs"""
+        if not kwargs:
+            return False
+        return self.client.send_post(f"/update_plan/{plan_id}", kwargs)
+
+    def update_plan_entry(self, plan_id, entry_id, **kwargs):
+        """Given a plan id and entry id, update the entry per kwargs"""
+        if not kwargs:
+            return False
+        return self.client.send_post(f"/update_plan_entry/{plan_id}/{entry_id}", kwargs)
+
     def matching_configs(self, testrail_project_id, config_group_id, config_name):
         """Given a project id, a config group id, and a config name, return the matching config object"""
         configs = self.client.send_get(f"/get_configs/{testrail_project_id}")

l10n_CM/sites/whittard/GB/whittard_cc.html

@@ -19,6 +19,37 @@
 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"
+
+
+def get_execution_link() -> str:
+    """Using environment variables, get the link to the test execution"""
+    link = ""
+    if "TASKCLUSTER_PROXY_URL" in os.environ:
+        link = TC_EXECUTION_TEMPLATE
+        for item in ["RUN_ID", "TASK_ID"]:
+            link = link.replace(f"%{item}%", os.environ.get(item))
+        return link
+
+
+def replace_link_in_description(description, os_name) -> str:
+    """Add or replace a test execution link in the test run description"""
+    logging.warning(f"Modifying plan description for %{os_name}%")
+    if os_name not in description:
+        # TODO: remove following conditional when links for GHA resolved
+        if os_name == "Linux":
+            return f"{description}\n[{os_name} execution link]({get_execution_link()})"
+    else:
+        link = get_execution_link()
+        if link in description:
+            return description
+        lines = description.split("\n")
+        for i, line in enumerate(lines):
+            if os_name in line:
+                lines[i] = (
+                    f"{description}\n[{os_name} execution link]({get_execution_link()})"
+                )
+    return description
 
 
 def get_plan_title(version_str: str, channel: str) -> str:
@@ -321,6 +352,12 @@ 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