зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1516568 - Allow run-task jobs on docker-worker to use internal tooltool downloads. r=ahal
This code already exists for other (non-run-task jobs) on docker worker, so this patch just reuses the existing code but adds a bit to the run-task schema to allow the task to opt in. Differential Revision: https://phabricator.services.mozilla.com/D19365 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
4f2f7acba6
Коммит
e5c19300b2
|
@ -10,7 +10,10 @@ from __future__ import absolute_import, print_function, unicode_literals
|
|||
from taskgraph.transforms.task import taskref_or_string
|
||||
from taskgraph.transforms.job import run_job_using
|
||||
from taskgraph.util.schema import Schema
|
||||
from taskgraph.transforms.job.common import support_vcs_checkout
|
||||
from taskgraph.transforms.job.common import (
|
||||
docker_worker_add_tooltool,
|
||||
support_vcs_checkout
|
||||
)
|
||||
from voluptuous import Any, Optional, Required
|
||||
|
||||
run_task_schema = Schema({
|
||||
|
@ -42,6 +45,16 @@ run_task_schema = Schema({
|
|||
|
||||
# Base work directory used to set up the task.
|
||||
Required('workdir'): basestring,
|
||||
|
||||
# If not false, tooltool downloads will be enabled via relengAPIProxy
|
||||
# for either just public files, or all files. Only supported on
|
||||
# docker-worker.
|
||||
Required('tooltool-downloads'): Any(
|
||||
False,
|
||||
'public',
|
||||
'internal',
|
||||
),
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
@ -64,6 +77,7 @@ worker_defaults = {
|
|||
'checkout': True,
|
||||
'comm-checkout': False,
|
||||
'sparse-profile': None,
|
||||
'tooltool-downloads': False,
|
||||
}
|
||||
|
||||
|
||||
|
@ -79,6 +93,10 @@ def docker_worker_run_task(config, job, taskdesc):
|
|||
command = ['/builds/worker/bin/run-task']
|
||||
common_setup(config, job, taskdesc, command)
|
||||
|
||||
if run['tooltool-downloads']:
|
||||
internal = run['tooltool-downloads'] == 'internal'
|
||||
docker_worker_add_tooltool(config, job, taskdesc, internal=internal)
|
||||
|
||||
if run.get('cache-dotcache'):
|
||||
worker['caches'].append({
|
||||
'type': 'persistent',
|
||||
|
|
Загрузка…
Ссылка в новой задаче