Bug 1286075: clean up mulet builds; r=gerard-majax draft
authorDustin J. Mitchell <dustin@mozilla.com>
Wed, 07 Sep 2016 16:09:30 +0000
changeset 412761 6678d851ab71813170526d624d692938f0b5c59f
parent 412760 3018db036f1d5ebbbd42cba66ee74ed3dfd82a0e
child 412762 e5ebd4095e03a72426c8f86f7af810340eac8d46
push id29252
push userdmitchell@mozilla.com
push dateMon, 12 Sep 2016 19:16:39 +0000
reviewersgerard-majax
bugs1286075
milestone51.0a1
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
taskcluster/taskgraph/transforms/job/mulet.py
--- 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},
     ]