Bug 1485861 - Define many treeherder symbols based on the parent task. r=aki

This changes a bunch of symbols, notably:
* Group name BMR-L10n(*) ==> BMR(*)
* Group name BM-L10n(*) ==> BM(*)
* Groups the BMR symbol itself for en-US Nightly [so BMR ==> BMR(N)]
* Groups the BM symbol itself for en-US Nightly [so BM ==> BM(N)]
* Changes Source Signing fron symbol Bs to Srcs
* Groups Source signing beetmoving as BM(Srcs) instead of symbol BM-S
* Balrog complete update submission changes from c-Up(N) to c-Up(Ns) [Fennec Only]
* Beetmover en-US changes from symbol BM-S to BM(Ns) [used in Fennec]
* Beetmover Checksums (en-US) changes from BMcs(N) => BMcs(Ns) [fennec]
* Checksums signing (en-US, fennec) changes from cs(N) => cs(Ns)
* [Asan] Balrog changed [c-UP(N) ==> c-UP(BoR)]
* [Asan] signing changed from Ns to BoRs
* [Asan] checksums signing changed from cs(N) to cs(BoR)
* [Asan] Change generated source uploading from Ugs ==> UgsBoR

Differential Revision: https://phabricator.services.mozilla.com/D4178

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Justin Wood 2019-01-02 21:53:25 +00:00
Родитель 8be2e31b96
Коммит 720b949436
11 изменённых файлов: 46 добавлений и 20 удалений

Просмотреть файл

@ -54,8 +54,8 @@ treeherder:
'X-sw': 'Xpcshell tests with serviceworker redesign'
'L10n': 'Localised Repacks'
'L10n-Rpk': 'Localized Repackaged Repacks'
'BM-L10n': 'Beetmover for locales'
'BMR-L10n': 'Beetmover repackages for locales'
'BM': 'Beetmover'
'BMR': 'Beetmover repackages'
'c-Up': 'Balrog submission of complete updates'
'cs': 'Checksum signing'
'css': 'Checksum signing for source'

Просмотреть файл

@ -16,6 +16,7 @@ from taskgraph.util.schema import (
from taskgraph.util.scriptworker import (
get_balrog_server_scope, get_worker_type_for_scope
)
from taskgraph.util.treeherder import replace_group
from taskgraph.transforms.task import task_description_schema
from voluptuous import Optional
@ -89,10 +90,10 @@ def make_task_description(config, jobs):
attributes = copy_attributes_from_dependent_job(dep_job)
treeherder_job_symbol = dep_job.attributes.get('locale', 'N')
treeherder_job_symbol = dep_job.task['extra']['treeherder']['symbol']
treeherder['symbol'] = replace_group(treeherder_job_symbol, 'c-Up')
if dep_job.attributes.get('locale'):
treeherder['symbol'] = 'c-Up({})'.format(treeherder_job_symbol)
attributes['locale'] = dep_job.attributes.get('locale')
label = job['label']

Просмотреть файл

@ -20,6 +20,7 @@ from taskgraph.util.scriptworker import (generate_beetmover_artifact_map,
get_worker_type_for_scope,
should_use_artifact_map)
from taskgraph.util.taskcluster import get_artifact_prefix
from taskgraph.util.treeherder import replace_group
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
@ -150,7 +151,10 @@ def make_task_description(config, jobs):
attributes = dep_job.attributes
treeherder = job.get('treeherder', {})
treeherder.setdefault('symbol', 'BM-S')
treeherder.setdefault(
'symbol',
replace_group(dep_job.task['extra']['treeherder']['symbol'], 'BM')
)
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',

Просмотреть файл

@ -19,6 +19,7 @@ from taskgraph.util.scriptworker import (generate_beetmover_artifact_map,
get_worker_type_for_scope,
should_use_artifact_map)
from voluptuous import Optional, Required
from taskgraph.util.treeherder import replace_group
from taskgraph.transforms.task import task_description_schema
# Voluptuous uses marker objects as dictionary *keys*, but they are not
@ -46,7 +47,10 @@ def make_beetmover_checksums_description(config, jobs):
attributes = dep_job.attributes
treeherder = job.get('treeherder', {})
treeherder.setdefault('symbol', 'BMcs(N)')
treeherder.setdefault(
'symbol',
replace_group(dep_job.task['extra']['treeherder']['symbol'], 'BMcs')
)
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',

Просмотреть файл

@ -19,7 +19,7 @@ def make_beetmover_description(config, jobs):
dep_job = job['primary-dependency']
for locale in dep_job.attributes.get('chunk_locales', []):
group = 'BM-L10n'
group = 'BM'
# add the locale code
symbol = locale

Просмотреть файл

@ -18,6 +18,7 @@ from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
get_beetmover_action_scope,
get_worker_type_for_scope)
from taskgraph.util.taskcluster import get_artifact_prefix
from taskgraph.util.treeherder import replace_group
from taskgraph.transforms.task import task_description_schema
from voluptuous import Required, Optional
@ -171,7 +172,13 @@ def make_task_description(config, jobs):
attributes = dep_job.attributes
treeherder = job.get('treeherder', {})
treeherder.setdefault('symbol', 'BM-R')
upstream_symbol = dep_job.task['extra']['treeherder']['symbol']
if 'build' in job['dependent-tasks']:
upstream_symbol = job['dependent-tasks']['build'].task['extra']['treeherder']['symbol']
treeherder.setdefault(
'symbol',
replace_group(upstream_symbol, 'BMR')
)
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',

Просмотреть файл

@ -23,7 +23,7 @@ def make_beetmover_description(config, jobs):
yield job
continue
group = 'BMR-L10n'
group = 'BMR'
# add the locale code
symbol = locale

Просмотреть файл

@ -15,6 +15,7 @@ from taskgraph.util.scriptworker import (
get_worker_type_for_scope,
add_scope_prefix,
)
from taskgraph.util.treeherder import replace_group
from taskgraph.transforms.task import task_description_schema
from voluptuous import Required, Optional
@ -41,7 +42,10 @@ def make_checksums_signing_description(config, jobs):
attributes = dep_job.attributes
treeherder = job.get('treeherder', {})
treeherder.setdefault('symbol', 'cs(N)')
treeherder.setdefault(
'symbol',
replace_group(dep_job.task['extra']['treeherder']['symbol'], 'cs')
)
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',

Просмотреть файл

@ -104,9 +104,6 @@ def make_task_description(config, jobs):
treeherder.setdefault('platform', _generate_treeherder_platform(
dep_th_platform, build_platform, build_type
))
treeherder.setdefault('symbol', _generate_treeherder_symbol(
is_nightly, build_platform
))
# ccov builds are tier 2, so they cannot have tier 1 tasks
# depending on them.
@ -114,6 +111,9 @@ def make_task_description(config, jobs):
'tier',
dep_job.task.get('extra', {}).get('treeherder', {}).get('tier', 1)
)
treeherder.setdefault('symbol', _generate_treeherder_symbol(
dep_job.task.get('extra', {}).get('treeherder', {}).get('symbol')
))
treeherder.setdefault('kind', 'build')
label = job['label']
@ -171,8 +171,6 @@ def _generate_treeherder_platform(dep_th_platform, build_platform, build_type):
return '{}/{}'.format(dep_th_platform, actual_build_type)
def _generate_treeherder_symbol(is_nightly, build_platform):
if is_nightly:
return 'Ns'
else:
return 'Bs'
def _generate_treeherder_symbol(build_symbol):
symbol = build_symbol + 's'
return symbol

Просмотреть файл

@ -32,6 +32,8 @@ def add_task_info(config, jobs):
plat = '{}/{}'.format(dep_th['machine']['platform'], dep_task.attributes.get('build_type'))
job['treeherder']['platform'] = plat
job['treeherder']['tier'] = dep_th['tier']
if dep_th['symbol'] != "N":
job['treeherder']['symbol'] = "Ugs{}".format(dep_th['symbol'])
# Add an environment variable pointing at the artifact from the build.
artifact_url = get_artifact_url('<build>',
'public/build/target.generated-files.tar.gz')

Просмотреть файл

@ -24,8 +24,14 @@ def join_symbol(group, symbol):
return '{}({})'.format(group, symbol)
def add_suffix(treeherder_symbol, chunk):
def add_suffix(treeherder_symbol, suffix):
"""Add a suffix to a treeherder symbol that may contain a group."""
group, symbol = split_symbol(treeherder_symbol)
symbol += str(chunk)
symbol += str(suffix)
return join_symbol(group, symbol)
def replace_group(treeherder_symbol, new_group):
"""Add a suffix to a treeherder symbol that may contain a group."""
_, symbol = split_symbol(treeherder_symbol)
return join_symbol(new_group, symbol)