--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -220,17 +220,17 @@ def target_tasks_cedar(full_task_graph,
@_target_task('graphics_tasks')
def target_tasks_graphics(full_task_graph, parameters, graph_config):
"""In addition to doing the filtering by project that the 'default'
filter does, also remove artifact builds because we have csets on
the graphics branch that aren't on the candidate branches of artifact
builds"""
- filtered_for_project = target_tasks_default(full_task_graph, parameters)
+ filtered_for_project = target_tasks_default(full_task_graph, parameters, graph_config)
def filter(task):
if task.attributes['kind'] == 'artifact-build':
return False
return True
return [l for l in filtered_for_project if filter(full_task_graph[l])]
@@ -348,17 +348,17 @@ def target_tasks_mozilla_beta_desktop_pr
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
@_target_task('publish_firefox')
def target_tasks_publish_firefox(full_task_graph, parameters, graph_config):
"""Select the set of tasks required to publish a candidates build of firefox.
Previous build deps will be optimized out via action task."""
filtered_for_candidates = target_tasks_mozilla_beta_desktop_promotion(
- full_task_graph, parameters
+ full_task_graph, parameters, graph_config,
)
def filter(task):
# Include promotion tasks; these will be optimized out
if task.label in filtered_for_candidates:
return True
# TODO: add beetmover push-to-releases
# TODO: tagging / version bumping
@@ -374,17 +374,17 @@ def target_tasks_publish_firefox(full_ta
return [l for l, t in full_task_graph.iteritems() if filter(t)]
@_target_task('candidates_fennec')
def target_tasks_candidates_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)
+ 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', 'push-apk-breakpoint'):
@@ -401,17 +401,19 @@ def target_tasks_candidates_fennec(full_
return [l for l, t in full_task_graph.tasks.iteritems() if filter(full_task_graph[l])]
@_target_task('publish_fennec')
def target_tasks_publish_fennec(full_task_graph, parameters, graph_config):
"""Select the set of tasks required to publish a candidates build of fennec.
Previous build deps will be optimized out via action task."""
- filtered_for_candidates = target_tasks_candidates_fennec(full_task_graph, parameters)
+ filtered_for_candidates = target_tasks_candidates_fennec(
+ full_task_graph, parameters, graph_config,
+ )
def filter(task):
# Include candidates build tasks; these will be optimized out
if task.label in filtered_for_candidates:
return True
if task.task['payload'].get('properties', {}).get('product') == 'fennec':
if task.kind in ('release-mark-as-shipped',
'release-bouncer-aliases',
@@ -492,20 +494,20 @@ def target_tasks_nightly_win64(full_task
@_target_task('nightly_desktop')
def target_tasks_nightly_desktop(full_task_graph, parameters, graph_config):
"""Select the set of tasks required for a nightly build of linux, mac,
windows."""
# Avoid duplicate tasks.
return list(
- set(target_tasks_nightly_win32(full_task_graph, parameters))
- | set(target_tasks_nightly_win64(full_task_graph, parameters))
- | set(target_tasks_nightly_macosx(full_task_graph, parameters))
- | set(target_tasks_nightly_linux(full_task_graph, parameters))
+ set(target_tasks_nightly_win32(full_task_graph, parameters, graph_config))
+ | set(target_tasks_nightly_win64(full_task_graph, parameters, graph_config))
+ | set(target_tasks_nightly_macosx(full_task_graph, parameters, graph_config))
+ | set(target_tasks_nightly_linux(full_task_graph, parameters, graph_config))
)
# Opt DMD builds should only run nightly
@_target_task('nightly_dmd')
def target_tasks_dmd(full_task_graph, parameters, graph_config):
"""Target DMD that run nightly on the m-c branch."""
def filter(task):