--- a/taskcluster/taskgraph/transforms/job/spidermonkey.py
+++ b/taskcluster/taskgraph/transforms/job/spidermonkey.py
@@ -7,19 +7,18 @@ Support for running spidermonkey jobs vi
from __future__ import absolute_import, print_function, unicode_literals
import time
from voluptuous import Schema, Required, Optional, Any
from taskgraph.transforms.job import run_job_using
from taskgraph.transforms.job.common import (
- docker_worker_add_gecko_vcs_env_vars,
- docker_worker_add_tc_vcs_cache,
- docker_worker_add_public_artifacts
+ docker_worker_add_public_artifacts,
+ docker_worker_support_vcs_checkout,
)
sm_run_schema = Schema({
Required('using'): Any('spidermonkey', 'spidermonkey-package'),
# The SPIDERMONKEY_VARIANT
Required('spidermonkey-variant'): basestring,
@@ -41,43 +40,45 @@ def docker_worker_spidermonkey(config, j
if int(config.params['level']) > 1:
worker['caches'].append({
'type': 'persistent',
'name': 'level-{}-{}-build-spidermonkey-workspace'.format(
config.params['level'], config.params['project']),
'mount-point': "/home/worker/workspace",
})
- docker_worker_add_tc_vcs_cache(config, job, taskdesc)
docker_worker_add_public_artifacts(config, job, taskdesc)
- docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
env = worker['env']
env.update({
'MOZHARNESS_DISABLE': 'true',
- 'TOOLS_DISABLE': 'true',
'SPIDERMONKEY_VARIANT': run['spidermonkey-variant'],
'MOZ_BUILD_DATE': time.strftime("%Y%m%d%H%M%S", time.gmtime(config.params['pushdate'])),
'MOZ_SCM_LEVEL': config.params['level'],
})
# tooltool downloads; note that this script downloads using the API
# endpoiint directly, rather than via relengapi-proxy
worker['caches'].append({
'type': 'persistent',
'name': 'tooltool-cache',
'mount-point': '/home/worker/tooltool-cache',
})
env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'
if run.get('tooltool-manifest'):
env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
+ docker_worker_support_vcs_checkout(config, job, taskdesc)
+
script = "build-sm.sh"
if run['using'] == 'spidermonkey-package':
script = "build-sm-package.sh"
worker['command'] = [
- "/bin/bash",
- "-c",
- "cd /home/worker/ "
- "&& ./bin/checkout-sources.sh "
- "&& ./workspace/build/src/taskcluster/scripts/builder/" + script
+ '/home/worker/bin/run-task',
+ '--chown-recursive', '/home/worker/workspace',
+ '--chown-recursive', '/home/worker/tooltool-cache',
+ '--vcs-checkout', '/home/worker/workspace/build/src',
+ '--',
+ '/bin/bash',
+ '-c',
+ 'cd /home/worker && workspace/build/src/taskcluster/scripts/builder/%s' % script
]