scriptworker 63.4.5__tar.gz → 63.5.0__tar.gz

{scriptworker-63.4.5 → scriptworker-63.5.0}/HISTORY.rst

@@ -4,6 +4,21 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`__.
 
+63.5.0 - 2026-09-23
+-------------------
+
+Fixed
+~~~~~
+
+- Add `mozilla-firefox` as a Github owner for Firefox
+- Url parsing bug when Github <owner> has <repo> as a substring
+
+Added
+~~~~~
+
+- Allow tasks sourced from "Git mirrors" to run in graphs alongside tasks
+  sourced from their Mercurial equivalents
+
 63.4.5 - 2026-09-11
 -------------------
 

{scriptworker-63.4.5 → scriptworker-63.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: scriptworker
-Version: 63.4.5
+Version: 63.5.0
 Summary: Taskcluster scriptworker
 Author-email: Mozilla Release Engineering <releng@mozilla.com>
 License-File: LICENSE

{scriptworker-63.4.5 → scriptworker-63.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scriptworker"
-version = "63.4.5"
+version = "63.5.0"
 description = "Taskcluster scriptworker"
 authors = [
     { name = "Mozilla Release Engineering", email = "releng@mozilla.com" },

{scriptworker-63.4.5 → scriptworker-63.5.0}/src/scriptworker/constants.py

@@ -435,6 +435,43 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                 )
             }
         ),
+        # XXX While migrating Firefox from hg.mozilla.org to GitHub, graphs are
+        # still generated by decision tasks from hg, but some tasks in them
+        # clone from the GitHub mirror instead. This maps an hg repo to its
+        # GitHub mirror. A task whose source is the mirror of its parent task's
+        # repo is treated as coming from the parent's repo; its definition has
+        # already been verified against the parent task's graph. Parent
+        # (decision/action) tasks themselves are never mapped.
+        # Remove this once the migration is complete.
+        "hg_git_mirrors": immutabledict(
+            {
+                "by-cot-product": immutabledict(
+                    {
+                        "adhoc": immutabledict({}),
+                        "app-services": immutabledict({}),
+                        "enterprise": immutabledict({}),
+                        "firefox": immutabledict(
+                            {
+                                "/mozilla-central": "/mozilla-firefox/firefox",
+                                "/integration/autoland": "/mozilla-firefox/firefox",
+                                "/releases/mozilla-beta": "/mozilla-firefox/firefox",
+                                "/releases/mozilla-release": "/mozilla-firefox/firefox",
+                                "/releases/mozilla-esr115": "/mozilla-firefox/firefox",
+                                "/releases/mozilla-esr140": "/mozilla-firefox/firefox",
+                                "/releases/mozilla-esr153": "/mozilla-firefox/firefox",
+                            }
+                        ),
+                        "glean": immutabledict({}),
+                        "mobile": immutabledict({}),
+                        "mozillavpn": immutabledict({}),
+                        "scriptworker": immutabledict({}),
+                        "thunderbird": immutabledict({}),
+                        "translations": immutabledict({}),
+                        "xpi": immutabledict({}),
+                    }
+                )
+            }
+        ),
         "valid_tasks_for": immutabledict(
             {
                 "by-cot-product": immutabledict(
@@ -514,7 +551,7 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                             "mozilla",
                             "thunderbird",
                         ),
-                        "firefox": "",
+                        "firefox": "mozilla-firefox",
                         "glean": "mozilla",
                         "mobile": "mozilla-mobile",
                         "mozillavpn": "mozilla-mobile",

{scriptworker-63.4.5 → scriptworker-63.5.0}/src/scriptworker/cot/verify.py

@@ -40,7 +40,12 @@ from scriptworker.constants import DEFAULT_CONFIG
 from scriptworker.context import Context
 from scriptworker.ed25519 import ed25519_public_key_from_string, verify_ed25519_signature
 from scriptworker.exceptions import BaseDownloadError, CoTError, ScriptWorkerEd25519Error
-from scriptworker.github import GitHubRepository, extract_github_repo_full_name, extract_github_repo_owner_and_name, extract_github_repo_ssh_url
+from scriptworker.github import (
+    GitHubRepository,
+    extract_github_repo_full_name,
+    extract_github_repo_owner_and_name,
+    extract_github_repo_ssh_url,
+)
 from scriptworker.log import contextual_log_handler, get_chain_of_trust_log_filename
 from scriptworker.task import (
     get_action_callback_name,
@@ -1983,6 +1988,44 @@ def get_source_url(obj):
     return source
 
 
+# hg_git_mirrors {{{1
+def _get_parent_repo(chain, repos):
+    """Get the repo of ``chain``'s parent (decision/action) tasks.
+
+    These are the tasks whose definitions are rebuilt from the tree, and that
+    the other tasks in the graph derive their trust from.
+
+    Args:
+        chain (ChainOfTrust): the chain we're operating on
+        repos (dict): the repo path of each object in the chain
+
+    Returns:
+        str: the parent tasks' repo path. If they don't agree, or can't be
+            found, ``chain``'s repo; any mismatch is reported by the sibling check.
+
+    """
+    parent_repos = {repo for obj, repo in repos.items() if obj.decision_task_id == chain.decision_task_id and obj.task_type in PARENT_TASK_TYPES}
+    if len(parent_repos) == 1:
+        return parent_repos.pop()
+    return repos[chain]
+
+
+def _is_git_mirror(chain, repo, parent_repo):
+    """Determine whether ``repo`` is the git mirror of ``parent_repo``.
+
+    Args:
+        chain (ChainOfTrust): the chain we're operating on
+        repo (str): a non-parent task's repo path
+        parent_repo (str): the parent tasks' repo path
+
+    Returns:
+        bool: whether ``repo`` is the git mirror of ``parent_repo``.
+
+    """
+    mirrors = chain.context.config["hg_git_mirrors"] or {}
+    return repo is not None and mirrors.get(parent_repo) == repo
+
+
 # trace_back_to_tree {{{1
 async def trace_back_to_tree(chain):
     """Trace the chain back to the tree.
@@ -2011,6 +2054,17 @@ async def trace_back_to_tree(chain):
         source_url = get_source_url(obj)
         repo_path = match_url_regex(chain.context.config["trusted_vcs_rules"], source_url, match_url_path_callback)
         repos[obj] = repo_path
+    # XXX During the hg -> git migration, graphs generated from hg may contain
+    # tasks sourced from the git mirror. Treat those as coming from the parent
+    # tasks' repo. Parent tasks are never mapped: their source is what their
+    # definition gets rebuilt from, so it must be trusted in its own right.
+    parent_repo = _get_parent_repo(chain, repos)
+    for obj, repo in repos.items():
+        if obj.decision_task_id != chain.decision_task_id or obj.task_type in PARENT_TASK_TYPES:
+            continue
+        if _is_git_mirror(chain, repo, parent_repo):
+            log.info(f"{obj.name} {obj.task_id}: {repo} is the git mirror of {parent_repo}")
+            repos[obj] = parent_repo
     # check for restricted scopes.
     my_repo = repos[chain]
     for scope in chain.task["scopes"]:

{scriptworker-63.4.5 → scriptworker-63.5.0}/src/scriptworker/github.py

@@ -3,6 +3,7 @@
 import asyncio
 import logging
 import re
+from urllib.parse import unquote, urlparse
 
 from github3 import GitHub
 from github3.exceptions import GitHubException
@@ -202,6 +203,8 @@ def extract_github_repo_owner_and_name(url):
     _check_github_url_is_supported(url)
 
     parts = get_parts_of_url_path(url)
+    if len(parts) < 2:
+        raise ValueError(f"Could not extract repo owner and name from GitHub URL: {url}")
     repo_owner = parts[0]
     repo_name = parts[1]
 
@@ -257,17 +260,20 @@ def extract_github_repo_and_revision_from_source_url(url):
     """
     _check_github_url_is_supported(url)
 
-    parts = get_parts_of_url_path(url)
-    repo_name = parts[1]
+    parsed = urlparse(url)
+    parts = unquote(parsed.path).lstrip("/").split("/")
+    if len(parts) < 2:
+        raise ValueError(f"Could not extract repo owner and name from GitHub URL: {url}")
+    repo_owner = parts[0]
+    repo_name = _strip_trailing_dot_git(parts[1])
     try:
         revision = parts[3]
     except IndexError:
-        raise ValueError("Revision cannot be extracted from url: {}".format(url))
+        raise ValueError(f"Revision cannot be extracted from url: {url}")
 
-    end_index = url.index(repo_name) + len(repo_name)
-    repo_url = url[:end_index]
+    repo_url = f"{parsed.scheme}://{parsed.netloc}/{repo_owner}/{repo_name}"
 
-    return _strip_trailing_dot_git(repo_url), revision
+    return repo_url, revision
 
 
 def _strip_trailing_dot_git(url):