Skip to content

Commit

Permalink
bug 1388581 - split win32/win64 nightly hooks. r=Callek
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: 8Gr8Cu9SLXQ

--HG--
extra : rebase_source : e44f938725ed66a5016deb0aa2973eb9e33c8cbc
  • Loading branch information
escapewindow committed Aug 9, 2017
1 parent 54c8c0a commit 8bd3628
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 7 deletions.
16 changes: 13 additions & 3 deletions .cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,21 @@ jobs:
- date
when: [] # never (hook only)

- name: nightly-desktop-win
- name: nightly-desktop-win32
job:
type: decision-task
treeherder-symbol: Nd-Win
target-tasks-method: nightly_win
treeherder-symbol: Nd-win32
target-tasks-method: nightly_win32
run-on-projects:
- mozilla-central
- date
when: [] # never (hook only)

- name: nightly-desktop-win64
job:
type: decision-task
treeherder-symbol: Nd-win64
target-tasks-method: nightly_win64
run-on-projects:
- mozilla-central
- date
Expand Down
23 changes: 19 additions & 4 deletions taskcluster/taskgraph/target_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,16 +350,30 @@ def filter(task):
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]


@_target_task('nightly_win')
def target_tasks_nightly_win(full_task_graph, parameters):
@_target_task('nightly_win32')
def target_tasks_nightly_win32(full_task_graph, parameters):
"""Select the set of tasks required for a nightly build of win32 and win64.
The nightly build process involves a pipeline of builds, signing,
and, eventually, uploading the tasks to balrog."""
def filter(task):
platform = task.attributes.get('build_platform')
if not filter_for_project(task, parameters):
return False
if platform in ('win32-nightly', 'win64-nightly'):
if platform in ('win32-nightly', ):
return task.attributes.get('nightly', False)
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]


@_target_task('nightly_win64')
def target_tasks_nightly_win64(full_task_graph, parameters):
"""Select the set of tasks required for a nightly build of win32 and win64.
The nightly build process involves a pipeline of builds, signing,
and, eventually, uploading the tasks to balrog."""
def filter(task):
platform = task.attributes.get('build_platform')
if not filter_for_project(task, parameters):
return False
if platform in ('win64-nightly', ):
return task.attributes.get('nightly', False)
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]

Expand All @@ -370,7 +384,8 @@ def target_tasks_nightly_desktop(full_task_graph, parameters):
windows."""
# Avoid duplicate tasks.
return list(
set(target_tasks_nightly_win(full_task_graph, parameters))
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))
)
Expand Down

0 comments on commit 8bd3628

Please sign in to comment.