Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a8ccca7bb19d (bug 1304019) for breaking Gecko Decision Task opt

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-09-28 08:50:18 +02:00
parent cd5d3f1870
commit 8829648c55
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taskcluster/ci/b2g-device/kind.yml
View File

@ -36,9 +36,7 @@ job-defaults:
- mozilla-central
- integration
- pine
index:
rank: pushdate # despite being tier-3, these jobs should be inserted into the
# index ranked by pushdate
jobs:
aries-eng/opt:

3
taskcluster/ci/build/mulet.yml
View File

@ -6,7 +6,6 @@ linux64-mulet/debug:
buildbot: linux64-mulet
gecko-v1: mulet.dbg
gecko-v2: mulet-dbg
rank: pushdate
treeherder:
platform: mulet-linux64/debug # See bug 1286086
symbol: B
@ -28,8 +27,6 @@ linux64-mulet/opt:
buildbot: linux64-mulet
gecko-v1: mulet.opt
gecko-v2: mulet-opt
rank: pushdate # despite being tier-3, these jobs should be inserted into the
# index ranked by pushdate
treeherder:
platform: mulet-linux64/opt # ?!?%
symbol: B

22
taskcluster/taskgraph/transforms/task.py
View File

@ -104,8 +104,6 @@ task_description_schema = Schema({
Required('gecko-v2'): basestring,
}
),
'rank': Any('by-tier', int, 'pushdate')
},
# The `run_on_projects` attribute, defaulting to "all". This dictates the
@ -435,20 +433,12 @@ def add_index_routes(config, tasks):
for tpl in V2_ROUTE_TEMPLATES:
routes.append(tpl.format(**subs))
# The default behavior is to rank tasks according to their tier
extra_index = task.setdefault('extra', {}).setdefault('index', {})
rank = index.get('rank', 'by-tier')
if rank == 'by-tier':
# rank is zero for non-tier-1 tasks and based on pushid for others;
# this sorts tier-{2,3} builds below tier-1 in the index
tier = task.get('treeherder', {}).get('tier', 3)
extra_index['rank'] = 0 if tier > 1 else int(config.params['pushdate'])
elif rank == 'pushdate':
extra_index['rank'] = int(config.params['pushdate'])
else:
extra_index['rank'] = rank
# rank is zero for non-tier-1 tasks and based on pushid for others;
# this sorts tier-{2,3} builds below tier-1 in the index
tier = task.get('treeherder', {}).get('tier', 3)
task.setdefault('extra', {})['index'] = {
'rank': 0 if tier > 1 else int(config.params['pushdate'])
}
del task['index']
yield task