mozilla-taskgraph 1.2.2__tar.gz → 1.3.0__tar.gz

{mozilla-taskgraph-1.2.2/src/mozilla_taskgraph.egg-info → mozilla-taskgraph-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mozilla-taskgraph
-Version: 1.2.2
+Version: 1.3.0
 Summary: Mozilla-specific transforms and utilities for Taskgraph
 Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
 Classifier: Development Status :: 4 - Beta
@@ -12,3 +12,4 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 License-File: LICENSE
+Requires-Dist: taskcluster-taskgraph<8,>=5.4

{mozilla-taskgraph-1.2.2 → mozilla-taskgraph-1.3.0}/src/mozilla_taskgraph/__init__.py

@@ -5,6 +5,16 @@
 from importlib import import_module
 
 from taskgraph.config import validate_graph_config
+from taskgraph.util import schema
+
+# Schemas for YAML files should use dashed identifiers by default. If there are
+# components of the schema for which there is a good reason to use another format,
+# exceptions can be added here.
+schema.EXCEPTED_SCHEMA_IDENTIFIERS.extend(
+    [
+        "bitrise",
+    ]
+)
 
 
 def register(graph_config):

{mozilla-taskgraph-1.2.2 → mozilla-taskgraph-1.3.0}/src/mozilla_taskgraph/actions/release_promotion.py

@@ -39,6 +39,17 @@ from mozilla_taskgraph.actions import make_action_available
                     "release version, and increments on rebuild."
                 ),
             },
+            "version": {
+                "type": "string",
+                "description": (
+                    "Optional: override the version for release promotion. "
+                    "Occasionally we'll land a taskgraph fix in a later "
+                    "commit, but want to act on a build from a previous "
+                    "commit. If a version bump has landed in the meantime, "
+                    "relying on the in-tree version will break things."
+                ),
+                "default": "",
+            },
             "do_not_optimize": {
                 "type": "array",
                 "description": (
@@ -127,11 +138,15 @@ def release_promotion_action(parameters, graph_config, input, task_group_id, tas
     parameters["shipping_phase"] = input["release_promotion_flavor"]
     parameters["tasks_for"] = "action"
 
-    version_parser_objpath = "mozilla_taskgraph.version:default_parser"
-    if "version-parser" in graph_config:
-        version_parser_objpath = graph_config["version-parser"]
-    version_func = find_object(version_parser_objpath)
-    parameters["version"] = version_func(parameters)
+    if input["version"]:
+        parameters["version"] = input["version"]
+    else:
+        if "version-parser" in graph_config:
+            version_parser_objpath = graph_config["version-parser"]
+        else:
+            version_parser_objpath = "mozilla_taskgraph.version:default_parser"
+        version_func = find_object(version_parser_objpath)
+        parameters["version"] = version_func(parameters)
 
     # make parameters read-only
     parameters = Parameters(**parameters)

{mozilla-taskgraph-1.2.2 → mozilla-taskgraph-1.3.0}/src/mozilla_taskgraph/version.py

@@ -2,11 +2,9 @@ import os
 
 from taskgraph.util.vcs import get_repository
 
-here = os.path.abspath(os.path.dirname(__file__))
-
 
 def default_parser(params):
-    repo_root = get_repository(here).path
+    repo_root = get_repository(os.getcwd()).path
 
     with open(os.path.join(repo_root, "version.txt")) as f:
         return f.read().strip()

mozilla-taskgraph-1.3.0/src/mozilla_taskgraph/worker_types.py

@@ -0,0 +1,117 @@
+from taskgraph.transforms.task import payload_builder
+from voluptuous import Extra, Optional, Required
+
+
+@payload_builder(
+    "scriptworker-bitrise",
+    schema={
+        Required("bitrise"): {
+            Required(
+                "app", description="Name of Bitrise App to schedule workflows on."
+            ): str,
+            Required(
+                "workflows",
+                description="List of workflows to trigger on specified app.",
+            ): [str],
+            Optional(
+                "build_params",
+                description="Parameters describing the build context to pass "
+                "onto Bitrise. All keys are optional but specific workflows "
+                "may depend on particular keys being set.",
+            ): {
+                Optional(
+                    "branch",
+                    description="The branch running the build. For pull "
+                    "requests, this should be the head branch.",
+                ): str,
+                Optional(
+                    "branch_dest",
+                    description="The destination branch where the branch "
+                    "running the build will merge into. Only valid for pull "
+                    "requests.",
+                ): str,
+                Optional(
+                    "branch_dest_repo_owner",
+                    description="The repository owning the destination branch. "
+                    "Only valid for pull requests.",
+                ): str,
+                Optional(
+                    "branch_repo_owner", description="The repository owning the branch."
+                ): str,
+                Optional(
+                    "commit_hash",
+                    description="The hash of the commit running the build.",
+                ): str,
+                Optional(
+                    "commit_message",
+                    description="The commit message of the commit running the build.",
+                ): str,
+                Optional(
+                    "environments",
+                    description="Environment variables to pass into the build.",
+                ): dict,
+                Optional(
+                    "pull_request_author",
+                    description="The author of the pull request running the build.",
+                ): str,
+                Optional(
+                    "pull_request_id",
+                    description="The id of the pull request running the build.",
+                ): int,
+                Optional(
+                    "skip_git_status_report",
+                    description="Whether Bitrise should send a status report to "
+                    "Github (default False).",
+                ): bool,
+                Optional(
+                    "tag", description="The tag of the commit running the build."
+                ): str,
+            },
+        },
+        Extra: object,
+    },
+)
+def build_bitrise_payload(config, task, task_def):
+    bitrise = task["worker"]["bitrise"]
+    build_params = task_def["payload"] = bitrise.get("build_params") or {}
+    task_def["tags"]["worker-implementation"] = "scriptworker"
+
+    scope_prefix = config.graph_config["scriptworker"]["scope-prefix"]
+    scopes = task_def.setdefault("scopes", [])
+    scopes.append(f"{scope_prefix}:bitrise:app:{bitrise['app']}")
+    scopes.extend(
+        [f"{scope_prefix}:bitrise:workflow:{wf}" for wf in bitrise["workflows"]]
+    )
+
+    # Set some build_params implicitly from Taskcluster params.
+    build_params.setdefault("commit_hash", config.params["head_rev"])
+    build_params.setdefault("branch_repo_owner", config.params["head_repository"])
+
+    if config.params["head_ref"]:
+        build_params.setdefault("branch", config.params["head_ref"])
+
+    if config.params["head_tag"]:
+        build_params.setdefault("tag", config.params["head_tag"])
+
+    if config.params["tasks_for"] == "github-pull-request":
+        build_params.setdefault("pull_request_author", config.params["owner"])
+
+        if config.params["base_ref"]:
+            build_params.setdefault("branch_dest", config.params["base_ref"])
+
+        if config.params["base_repository"]:
+            build_params.setdefault(
+                "branch_dest_repo_owner", config.params["base_repository"]
+            )
+
+
+@payload_builder(
+    "scriptworker-shipit",
+    schema={
+        Required("release-name"): str,
+    },
+)
+def build_shipit_payload(config, task, task_def):
+    worker = task["worker"]
+    task_def["tags"]["worker-implementation"] = "scriptworker"
+    task_def["payload"] = {"release_name": worker["release-name"]}

{mozilla-taskgraph-1.2.2 → mozilla-taskgraph-1.3.0/src/mozilla_taskgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mozilla-taskgraph
-Version: 1.2.2
+Version: 1.3.0
 Summary: Mozilla-specific transforms and utilities for Taskgraph
 Home-page: https://github.com/mozilla-releng/mozilla-taskgraph
 Classifier: Development Status :: 4 - Beta
@@ -12,3 +12,4 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 License-File: LICENSE
+Requires-Dist: taskcluster-taskgraph<8,>=5.4

mozilla-taskgraph-1.3.0/test/test_worker_types.py

@@ -0,0 +1,111 @@
+import inspect
+from pprint import pprint
+
+import pytest
+from taskgraph.transforms.task import payload_builders
+from taskgraph.util.schema import validate_schema
+
+from mozilla_taskgraph import worker_types
+
+
+@pytest.mark.parametrize(
+    "worker,extra_params,expected",
+    (
+        pytest.param({}, {}, Exception, id="missing bitrise"),
+        pytest.param({"bitrise": {"workflows": []}}, {}, Exception, id="missing app"),
+        pytest.param(
+            {"bitrise": {"app": "foo"}}, {}, Exception, id="missing workflows"
+        ),
+        pytest.param(
+            {"bitrise": {"app": "some-app", "workflows": ["bar", "baz"]}},
+            {},
+            {
+                "payload": {
+                    "branch": "default",
+                    "branch_repo_owner": "http://example.com/head/repo",
+                    "commit_hash": "abcdef",
+                },
+                "scopes": [
+                    "foo:bitrise:app:some-app",
+                    "foo:bitrise:workflow:bar",
+                    "foo:bitrise:workflow:baz",
+                ],
+                "tags": {"worker-implementation": "scriptworker"},
+            },
+            id="default params",
+        ),
+        pytest.param(
+            {"bitrise": {"app": "some-app", "workflows": ["bar"]}},
+            {"tasks_for": "github-pull-request"},
+            {
+                "payload": {
+                    "branch": "default",
+                    "branch_dest": "123456",
+                    "branch_dest_repo_owner": "http://example.com/base/repo",
+                    "branch_repo_owner": "http://example.com/head/repo",
+                    "commit_hash": "abcdef",
+                    "pull_request_author": "some-owner",
+                },
+                "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
+                "tags": {"worker-implementation": "scriptworker"},
+            },
+            id="pull request",
+        ),
+        pytest.param(
+            {"bitrise": {"app": "some-app", "workflows": ["bar"]}},
+            {
+                "base_ref": "",
+                "base_repository": "",
+                "head_ref": "",
+                "head_tag": "some-tag",
+                "tasks_for": "github-pull-request",
+            },
+            {
+                "payload": {
+                    "branch_repo_owner": "http://example.com/head/repo",
+                    "commit_hash": "abcdef",
+                    "pull_request_author": "some-owner",
+                    "tag": "some-tag",
+                },
+                "scopes": ["foo:bitrise:app:some-app", "foo:bitrise:workflow:bar"],
+                "tags": {"worker-implementation": "scriptworker"},
+            },
+            id="opposite params",  # this test helps hit other half of if statements
+        ),
+    ),
+)
+def test_build_bitrise_payload(
+    make_graph_config, make_transform_config, parameters, worker, extra_params, expected
+):
+    schema = payload_builders["scriptworker-bitrise"].schema
+
+    graph_config = make_graph_config(
+        extra_config={"scriptworker": {"scope-prefix": "foo"}}
+    )
+    parameters.update(extra_params)
+    config = make_transform_config(params=parameters, graph_cfg=graph_config)
+
+    worker.setdefault("implementation", "scriptworker-bitrise")
+    task = {"worker": worker}
+    task_def = {"tags": {}}
+
+    if inspect.isclass(expected) and issubclass(expected, Exception):
+        with pytest.raises(expected):
+            validate_schema(schema, worker, "schema error")
+            worker_types.build_bitrise_payload(config, task, task_def)
+    else:
+        validate_schema(schema, worker, "schema error")
+        worker_types.build_bitrise_payload(config, task, task_def)
+        print("Dumping result:")
+        pprint(task_def, indent=2)
+        assert task_def == expected
+
+
+def test_build_shipit_payload():
+    task = {"worker": {"release-name": "foo"}}
+    task_def = {"tags": {}}
+    worker_types.build_shipit_payload(None, task, task_def)
+    assert task_def == {
+        "payload": {"release_name": "foo"},
+        "tags": {"worker-implementation": "scriptworker"},
+    }

mozilla-taskgraph-1.2.2/src/mozilla_taskgraph/worker_types.py

@@ -1,14 +0,0 @@
-from taskgraph.transforms.task import payload_builder
-from voluptuous import Required
-
-
-@payload_builder(
-    "scriptworker-shipit",
-    schema={
-        Required("release-name"): str,
-    },
-)
-def build_shipit_payload(config, task, task_def):
-    worker = task["worker"]
-    task_def["tags"]["worker-implementation"] = "scriptworker"
-    task_def["payload"] = {"release_name": worker["release-name"]}

mozilla-taskgraph-1.2.2/test/test_worker_types.py

@@ -1,11 +0,0 @@
-from mozilla_taskgraph import worker_types
-
-
-def test_build_shipit_payload():
-    task = {"worker": {"release-name": "foo"}}
-    task_def = {"tags": {}}
-    worker_types.build_shipit_payload(None, task, task_def)
-    assert task_def == {
-        "payload": {"release_name": "foo"},
-        "tags": {"worker-implementation": "scriptworker"},
-    }