Bug 1643842: Don't depend on profile-generation if we are an artifact build; r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D79550
This commit is contained in:
Tom Prince 2020-06-15 19:49:30 +00:00
parent 8a031b09b0
commit 9ad2d142a7

View File

@ -117,12 +117,28 @@ def mozconfig(config, jobs):
yield job yield job
@transforms.add
def use_artifact(config, jobs):
if config.params.is_try():
use_artifact = config.params['try_task_config'].get('use-artifact-builds', False)
else:
use_artifact = False
for job in jobs:
if (config.kind == 'build' and use_artifact and
job.get('index', {}).get('job-name') in ARTIFACT_JOBS):
job['treeherder']['symbol'] += 'a'
job['worker']['env']['USE_ARTIFACT'] = '1'
job['attributes']['artifact-build'] = True
yield job
@transforms.add @transforms.add
def use_profile_data(config, jobs): def use_profile_data(config, jobs):
for job in jobs: for job in jobs:
use_pgo = job.pop('use-pgo', False) use_pgo = job.pop('use-pgo', False)
disable_pgo = config.params['try_task_config'].get('disable-pgo', False) disable_pgo = config.params['try_task_config'].get('disable-pgo', False)
if not use_pgo or disable_pgo: artifact_build = job['attributes'].get('artifact-build')
if not use_pgo or disable_pgo or artifact_build:
yield job yield job
continue continue
@ -161,18 +177,3 @@ def enable_full_crashsymbols(config, jobs):
job['worker']['env']['MOZ_DISABLE_FULL_SYMBOLS'] = '1' job['worker']['env']['MOZ_DISABLE_FULL_SYMBOLS'] = '1'
job['attributes'].pop('enable-full-crashsymbols', None) job['attributes'].pop('enable-full-crashsymbols', None)
yield job yield job
@transforms.add
def use_artifact(config, jobs):
if config.params.is_try():
use_artifact = config.params['try_task_config'].get('use-artifact-builds', False)
else:
use_artifact = False
for job in jobs:
if (config.kind == 'build' and use_artifact and
job.get('index', {}).get('job-name') in ARTIFACT_JOBS):
job['treeherder']['symbol'] += 'a'
job['worker']['env']['USE_ARTIFACT'] = '1'
job['attributes']['artifact-build'] = True
yield job