Bug 1562412 - [3-task notarization] fix ./mach try release r=Callek

- backs out 71e376fd296d
- fixes bug 1618162.

Differential Revision: https://phabricator.services.mozilla.com/D64459

--HG--
extra : moz-landing-system : lando

taskcluster/ci/build-notarization-part-1/kind.yml

@@ -25,4 +25,3 @@ job-template:
     treeherder:
         symbol: BN
     enable-signing-routes: false
-    run-on-projects: [release]

taskcluster/ci/build-notarization-poller/kind.yml

@@ -17,4 +17,3 @@ job-template:
     description-suffix: 'Mac Notarization Poller'
     worker:
         implementation: notarization-poller
-    run-on-projects: [release]

taskcluster/taskgraph/transforms/mac_notarization_poller.py

@@ -70,8 +70,7 @@ def make_task_description(config, jobs):
             'worker-type': 'mac-notarization-poller',
             'dependencies': {'part1': dep_job.label},
             'attributes': attributes,
-            'run-on-projects': job.get('run-on-projects',
-                                       dep_job.attributes.get('run_on_projects')),
+            'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'optimization': dep_job.optimization,
             'routes': job.get('routes', []),
             'shipping-product': job.get('shipping-product'),

taskcluster/taskgraph/transforms/signing.py

@@ -59,7 +59,6 @@ signing_description_schema = schema.extend({
     Optional('shipping-phase'): task_description_schema['shipping-phase'],
     Optional('shipping-product'): task_description_schema['shipping-product'],
     Optional('dependent-tasks'): {text_type: object},
-    Optional('run-on-projects'): task_description_schema['run-on-projects'],
 
     # Optional control for how long a task may run (aka maxRunTime)
     Optional('max-run-time'): int,
@@ -172,8 +171,7 @@ def make_task_description(config, jobs):
             'scopes': [signing_cert_scope] + signing_format_scopes,
             'dependencies': _generate_dependencies(job),
             'attributes': attributes,
-            'run-on-projects': job.get('run-on-projects',
-                                       dep_job.attributes.get('run_on_projects')),
+            'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'optimization': dep_job.optimization,
             'routes': job.get('routes', []),
             'shipping-product': job.get('shipping-product'),
@@ -202,6 +200,9 @@ def make_task_description(config, jobs):
                     mac_behavior = 'mac_notarize_part_3'
                 else:
                     raise Exception("Unknown kind {} for mac_behavior!".format(config.kind))
+            else:
+                if 'part-1' in config.kind:
+                    continue
             task['worker']['mac-behavior'] = mac_behavior
             worker_type_alias_map = {
                 'linux-depsigning': 'mac-depsigning',

taskcluster/taskgraph/transforms/upstream_artifact_task.py

@@ -8,7 +8,6 @@ Find upstream artifact task.
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.attributes import match_run_on_projects
 
 
 transforms = TransformSequence()
@@ -21,15 +20,6 @@ def find_upstream_artifact_task(config, jobs):
         if job.get('dependent-tasks'):
             dep_labels = [l for l in job['dependent-tasks'].keys()]
             for label in dep_labels:
-                # If we're going to filter out the notarization-part-1
-                # task due to run_on_projects, let's not use it as the
-                # upstream-artifact-task
-                if not match_run_on_projects(
-                    config.params['project'],
-                    job['dependent-tasks'][label].attributes.get('run_on_projects', {"all"})
-                ):
-                    del(job['dependent-tasks'][label])
-                    continue
                 if 'notarization-part-1' in label:
                     assert dep_job is None, "Can't determine whether " \
                         "{} or {} is dep_job!".format(dep_job.label, label)