Bug 1456246 - taskgraph: Perform release promotion needs on mozilla-esr60 on-push. (No Android). Fix bustage. r=rail
authorJustin Wood <Callek@gmail.com>
Tue, 24 Apr 2018 10:52:30 -0400
changeset 468915 62388dd742c7178f8cd35157dbc990e4679e1406
parent 468914 8981a88a236040df5cb69f565043ede490a3335e
child 468916 f0033384e7aed7471056c37b410bcd3a09753d7d
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs1456246
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1456246 - taskgraph: Perform release promotion needs on mozilla-esr60 on-push. (No Android). Fix bustage. r=rail
taskcluster/taskgraph/target_tasks.py
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -277,29 +277,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."""