Bug 1498019: [release] Don't include on-push jobs in promote graph targets; r=aki
authorTom Prince <mozilla@hocat.ca>
Wed, 10 Oct 2018 23:03:51 +0000
changeset 489010 5341d78f8108579b1cbdb666a940ccf695396df7
parent 489009 70d26c3920b819b539a7b6e0e87f128d27395311
child 489011 2bb555faef256f3da3f87c89d3b5d65921447e64
push id246
push userfmarier@mozilla.com
push dateSat, 13 Oct 2018 00:15:40 +0000
Bug 1498019: [release] Don't include on-push jobs in promote graph targets; r=aki All the required on-push jobs will be pulled into the graph as dependencies. The effect of this is to remove the upload symbols and generated sources tasks from the release promotion graphs. Differential Revision: https://phabricator.services.mozilla.com/D8306
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -303,33 +303,20 @@ def target_tasks_mozilla_esr60(full_task
 def target_tasks_promote_desktop(full_task_graph, parameters, graph_config):
     """Select the superset of tasks required to promote a beta or release build
     of a desktop product. This should include all non-android
     mozilla_{beta,release} tasks, plus l10n, beetmover, balrog, etc."""
-    beta_release_tasks = [l for l, t in full_task_graph.tasks.iteritems() if
-                          filter_beta_release_tasks(t, parameters,
-                                                    ignore_kinds=[],
-                                                    allow_l10n=True)]
     def filter(task):
         if task.attributes.get('shipping_product') != parameters['release_product']:
             return False
-        # Allow for {beta,release}_tasks; these will get optimized out to point
-        # to the previous graph using ``previous_graph_ids`` and
-        # ``previous_graph_kinds``.
-        # At some point this should filter by shipping_phase == 'build' and
-        # shipping_product matches.
-        if task.label in beta_release_tasks:
-            return True
         # 'secondary' balrog/update verify/final verify tasks only run for RCs
         if parameters.get('release_type') != 'release-rc':
             if 'secondary' in task.kind:
                 return False
         if task.attributes.get('shipping_phase') == 'promote':
             return True
@@ -388,27 +375,22 @@ def target_tasks_ship_desktop(full_task_
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 def target_tasks_promote_fennec(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a candidates build of fennec. The
     nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""
-    filtered_for_project = target_tasks_nightly_fennec(full_task_graph, parameters, graph_config)
     def filter(task):
         attr = task.attributes.get
         # Don't ship single locale fennec anymore - Bug 1408083
         if attr("locale") or attr("chunk_locales"):
             return False
-        if task.label in filtered_for_project:
-            if task.kind not in ('balrog', 'push-apk'):
-                if task.attributes.get('nightly'):
-                    return True
         if task.attributes.get('shipping_product') == 'fennec' and \
                 task.attributes.get('shipping_phase') == 'promote':
             return True
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(full_task_graph[l])]