Bug 1653171 - Shorten max run time for l10n repacks, r=Callek

Windows jobs typically take 23 minutes, so limit to 30 minutes so that cloning hangs terminate earlier than 2 hours.
Mac and Linux jobs are typically 5 minutes long, so bring the limit in to 15 minutes from an hour.

Also refactors so this the max run time is only specified in the kind, rather than some in the kind and some in the transform.

Differential Revision: https://phabricator.services.mozilla.com/D85077
This commit is contained in:
Nick Thomas 2020-07-28 02:02:59 +00:00
Родитель 31c90d555d
Коммит 59f1996c61
3 изменённых файлов: 14 добавлений и 11 удалений

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

@ -34,7 +34,10 @@ job-template:
# OSX has a special locale for japanese
macosx64.*: [ja]
default: [ja-JP-mac]
run-time: 3600
run-time:
by-build-platform:
default: 900
win.*: 1800
secrets: false
fetches:
toolchain:

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

@ -45,7 +45,10 @@ job-template:
# OSX has a special locale for japanese
macosx64.*: [ja]
default: [ja-JP-mac]
run-time: 3600
run-time:
by-build-platform:
default: 900
win.*: 1800
fetches:
toolchain:
by-build-platform:

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

@ -386,19 +386,16 @@ def make_job_description(config, jobs):
job_description['extra'] = job['extra']
job_description['run']['tooltool-downloads'] = job['tooltool']
job_description['worker'] = {
'max-run-time': job['run-time'],
'chain-of-trust': True,
}
if job['worker-type'] == "b-win2012":
job_description['worker'] = {
'os': 'windows',
'max-run-time': 7200,
'chain-of-trust': True,
}
job_description['worker']['os'] = 'windows'
job_description['run']['use-simple-package'] = False
job_description['run']['use-magic-mh-args'] = False
else:
job_description['worker'] = {
'max-run-time': job['run-time'],
'chain-of-trust': True,
}
job_description['run']['need-xvfb'] = True
if job.get('docker-image'):