Merge mozilla-central to autoland a=merge on a CLOSED TREE

python/mozbuild/mozbuild/artifact_commands.py

@@ -304,12 +304,8 @@ class PackageFrontend(MachCommandBase):
                          'should be determined in the decision task.')
                 return 1
             from taskgraph.optimize.strategies import IndexSearch
-            from taskgraph.parameters import Parameters
             from taskgraph.generator import load_tasks_for_kind
-            params = Parameters(
-                level=six.ensure_text(os.environ.get('MOZ_SCM_LEVEL', '3')),
-                strict=False,
-            )
+            params = {'level': six.ensure_text(os.environ.get('MOZ_SCM_LEVEL', '3'))}
 
             root_dir = mozpath.join(self.topsrcdir, 'taskcluster/ci')
             toolchains = load_tasks_for_kind(params, 'toolchain', root_dir=root_dir)

taskcluster/taskgraph/docker.py

@@ -8,10 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals
 
 import json
 import os
+import six
 import tarfile
 from io import BytesIO
 
-from taskgraph.parameters import Parameters
 from taskgraph.optimize.strategies import IndexSearch
 from taskgraph.util import docker
 from taskgraph.util.taskcluster import (
@@ -23,10 +23,7 @@ from . import GECKO
 
 
 def load_image_by_name(image_name, tag=None):
-    params = Parameters(
-        level=os.environ.get('MOZ_SCM_LEVEL', '3'),
-        strict=False,
-    )
+    params = {'level': six.ensure_text(os.environ.get('MOZ_SCM_LEVEL', '3'))}
     tasks = load_tasks_for_kind(params, 'docker-image')
     task = tasks['build-docker-image-{}'.format(image_name)]
     task_id = IndexSearch().should_replace_task(

taskcluster/taskgraph/generator.py

@@ -16,6 +16,7 @@ from .taskgraph import TaskGraph
 from .task import Task
 from .optimize import optimize_task_graph
 from .morph import morph
+from .parameters import Parameters
 from .util.python_path import find_object
 from .transforms.base import TransformSequence, TransformConfig
 from .util.verify import (
@@ -421,6 +422,7 @@ def load_tasks_for_kind(parameters, kind, root_dir=None):
     # make parameters read-write
     parameters = dict(parameters)
     parameters['target-kind'] = kind
+    parameters = Parameters(strict=False, **parameters)
     tgg = TaskGraphGenerator(root_dir=root_dir, parameters=parameters)
     return {
         task.task['metadata']['name']: task

taskcluster/taskgraph/test/test_generator.py

@@ -7,10 +7,11 @@ from __future__ import absolute_import, print_function, unicode_literals
 import sys
 
 import pytest
+import six
 import unittest
 from mozunit import main
 
-from taskgraph.generator import TaskGraphGenerator, Kind
+from taskgraph.generator import TaskGraphGenerator, Kind, load_tasks_for_kind
 from taskgraph.optimize import OptimizationStrategy
 from taskgraph.config import GraphConfig
 from taskgraph.util.templates import merge
@@ -31,8 +32,8 @@ def fake_loader(kind, path, config, parameters, loaded_tasks):
         task = {
             'kind': kind,
             'label': '{}-t-{}'.format(kind, i),
-            'attributes': {'_tasknum': str(i)},
-            'task': {'i': i},
+            'attributes': {'_tasknum': six.text_type(i)},
+            'task': {'i': i, "metadata": {"name": "t-{}".format(i)}},
             'dependencies': dependencies,
         }
         if 'job-defaults' in config:
@@ -210,5 +211,20 @@ class TestGenerator(unittest.TestCase):
             }))
 
 
+def test_load_tasks_for_kind(monkeypatch):
+    """
+    `load_tasks_for_kinds` will load the tasks for the provided kind
+    """
+    monkeypatch.setattr(generator, "TaskGraphGenerator", WithFakeKind)
+    monkeypatch.setattr(generator, "load_graph_config", fake_load_graph_config)
+
+    tasks = load_tasks_for_kind(
+        {"_kinds": [("_example-kind", []), ("docker-image", [])]},
+        "_example-kind",
+        "/root",
+    )
+    assert "t-1" in tasks and tasks["t-1"].label == "_example-kind-t-1"
+
+
 if __name__ == '__main__':
     main()