Bug 1286075: clean up mulet builds; r=gerard-majax
Set up tooltool to actually use its cache, and remove the unused tc-vcs cache
scope
MozReview-Commit-ID: H1VLxryQPEM
--- a/taskcluster/taskgraph/transforms/job/mulet.py
+++ b/taskcluster/taskgraph/transforms/job/mulet.py
@@ -48,30 +48,25 @@ def docker_worker_make_via_build_mulet_l
env = worker.setdefault('env', {})
env.update({
'MOZ_BUILD_DATE': time.strftime("%Y%m%d%H%M%S", time.gmtime(config.params['pushdate'])),
'MOZ_SCM_LEVEL': config.params['level'],
})
env['MOZCONFIG'] = run['mozconfig']
- env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
- # tooltool downloads
- worker['relengapi-proxy'] = True
+ # tooltool downloads (not via relengapi proxy)
worker['caches'].append({
'type': 'persistent',
'name': 'tooltool-cache',
- # N.B. different from build.sh
- # TODO(taskdiff): grepping suggests this isn't used..
- 'mount-point': '/home/worker/tools/tooltool-cache',
+ 'mount-point': '/home/worker/tooltool-cache',
})
- taskdesc['scopes'].extend([
- 'docker-worker:relengapi-proxy:tooltool.download.public',
- ])
+ env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'
+ env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
env['TOOLTOOL_REPO'] = 'https://github.com/mozilla/build-tooltool'
env['TOOLTOOL_REV'] = 'master'
worker['command'] = [
"/bin/bash",
"-c",
"checkout-gecko workspace"
" && cd ./workspace/gecko/taskcluster/scripts/builder"
@@ -100,20 +95,15 @@ def docker_worker_mulet_simulator(config
docker_worker_add_public_artifacts(config, job, taskdesc)
docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
taskdesc.setdefault('routes', []).extend([
'index.gecko.v1.{project}.latest.simulator.opt'.format(**config.params),
])
- # TODO(taskdiff): has the scope for this cache, but not the cache
- taskdesc.setdefault('scopes', []).extend([
- 'docker-worker:cache:level-{level}-{project}-tc-vcs'.format(**config.params),
- ])
-
shell_command = run['shell-command'].format(**config.params)
worker['command'] = [
"/bin/bash",
"-exc",
{'task-reference': shell_command},
]