From dc878bc63f75883a787e938beeca662b1ff64889 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 9 Feb 2017 10:41:35 +0900 Subject: [PATCH] Bug 1337980 - Use run-task for docker-based toolchain tasks. r=dustin --HG-- extra : rebase_source : bb5b42f91eda03c2cea64339ee7e7ebe73e93937 --- .../taskgraph/transforms/job/toolchain.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/taskcluster/taskgraph/transforms/job/toolchain.py b/taskcluster/taskgraph/transforms/job/toolchain.py index 968e70753dae..4b4b1bef2123 100644 --- a/taskcluster/taskgraph/transforms/job/toolchain.py +++ b/taskcluster/taskgraph/transforms/job/toolchain.py @@ -12,7 +12,8 @@ from voluptuous import Schema, Required, Any from taskgraph.transforms.job import run_job_using from taskgraph.transforms.job.common import ( docker_worker_add_tc_vcs_cache, - docker_worker_add_gecko_vcs_env_vars + docker_worker_add_gecko_vcs_env_vars, + docker_worker_support_vcs_checkout, ) toolchain_run_schema = Schema({ @@ -47,6 +48,7 @@ def docker_worker_toolchain(config, job, taskdesc): docker_worker_add_tc_vcs_cache(config, job, taskdesc) docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc) + docker_worker_support_vcs_checkout(config, job, taskdesc) env = worker['env'] env.update({ @@ -76,12 +78,16 @@ def docker_worker_toolchain(config, job, taskdesc): taskdesc['scopes'].append( 'docker-worker:relengapi-proxy:tooltool.download.internal') - command = ' && '.join([ - "cd /home/worker/", - "./bin/checkout-sources.sh", - "./workspace/build/src/taskcluster/scripts/misc/" + run['script'], - ]) - worker['command'] = ["/bin/bash", "-c", command] + worker['command'] = [ + '/home/worker/bin/run-task', + '--vcs-checkout=/home/worker/workspace/build/src', + '--', + 'bash', + '-c', + 'cd /home/worker && ' + './workspace/build/src/taskcluster/scripts/misc/{}'.format( + run['script']) + ] @run_job_using("generic-worker", "toolchain-script", schema=toolchain_run_schema)