Bug 1456246 - taskgraph: Perform release promotion needs on mozilla-esr60 on-push. (No Android). Fix bustage. r=rail a=aryx
authorJustin Wood <Callek@gmail.com>
Tue, 24 Apr 2018 10:52:30 -0400
changeset 463505 ebeb79cc9414b33b59cc6fda9598c9572cfa14cf
parent 463504 6713841ae8f77b9c1bde55936941a543b89af345
child 463506 81a11d030c5a76bd9dc322c178430e5f20e53aba
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail, aryx
bugs1456246
milestone60.0
Bug 1456246 - taskgraph: Perform release promotion needs on mozilla-esr60 on-push. (No Android). Fix bustage. r=rail a=aryx
taskcluster/taskgraph/target_tasks.py
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -302,29 +302,29 @@ def target_tasks_mozilla_release(full_ta
 
 @_target_task('mozilla_esr60_tasks')
 def target_tasks_mozilla_esr60(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a promotable beta or release build
     of desktop, plus android CI. The candidates build process involves a pipeline
     of builds and signing, but does not include beetmover or balrog jobs."""
 
     def filter(task):
+        if not filter_beta_release_tasks(task, parameters):
+            return False
+
         platform = task.attributes.get('build_platform')
 
         # Android is not built on esr.
         if platform and 'android' in platform:
             return False
 
         # All else was already filtered
         return True
 
-    tasks = [l for l, t in full_task_graph.tasks.iteritems() if
-             filter_beta_release_tasks(t, parameters)]
-
-    return [l for l, t in tasks.iteritems() if filter(t)]
+    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 
 
 @_target_task('promote_firefox')
 def target_tasks_promote_firefox(full_task_graph, parameters, graph_config):
     """Select the superset of tasks required to promote a beta or release build
     of firefox. This should include all non-android mozilla_{beta,release} tasks,
     plus l10n, beetmover, balrog, etc."""