Bug 1512285: Stop checking out tools; r=nthomas,gps
☠☠ backed out by f3fead0d1dc7 ☠ ☠
authorTom Prince <mozilla@hocat.ca>
Tue, 11 Dec 2018 19:50:58 +0000
changeset 450003 7d88308ca069c9621f43a157ce3083fb1af4b872
parent 450002 838f49d718a7688dc914c8fca4384de6add1e75b
child 450004 b4f3dc9b09560bb158dd8ea666a508454100a8cc
push id74522
push usergszorc@mozilla.com
push dateTue, 11 Dec 2018 19:53:27 +0000
treeherderautoland@59813ae1b6ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnthomas, gps
bugs1512285
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1512285: Stop checking out tools; r=nthomas,gps Differential Revision: https://phabricator.services.mozilla.com/D13855
taskcluster/scripts/run-task
taskcluster/taskgraph/transforms/job/mozharness.py
--- a/taskcluster/scripts/run-task
+++ b/taskcluster/scripts/run-task
@@ -556,17 +556,16 @@ def main(args):
         task_args = []
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--user', default='worker', help='user to run as')
     parser.add_argument('--group', default='worker', help='group to run as')
 
     add_vcs_arguments(parser, 'firefox', 'Firefox')
     add_vcs_arguments(parser, 'comm', 'Comm')
-    add_vcs_arguments(parser, 'tools', 'build/tools')
 
     parser.add_argument('--fetch-hgfingerprint', action='store_true',
                         help='Fetch the latest hgfingerprint from the secrets store, '
                         'using the taskclsuerProxy')
 
     args = parser.parse_args(our_args)
 
     # expand ~ in some paths
@@ -698,18 +697,17 @@ def main(args):
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
 
         if running_as_root:
             os.chown(store_path, uid, gid)
 
     prepare_checkout_dir(args.firefox_checkout)
-    prepare_checkout_dir(args.tools_checkout)
-    if args.firefox_checkout or args.tools_checkout or args.comm_checkout:
+    if args.firefox_checkout or args.comm_checkout:
         prepare_hg_store_path()
 
     if IS_POSIX and running_as_root:
         # Drop permissions to requested user.
         # This code is modeled after what `sudo` was observed to do in a Docker
         # container. We do not bother calling setrlimit() because containers have
         # their own limits.
         print_line(b'setup', b'running as %s:%s\n' % (
@@ -737,28 +735,16 @@ def main(args):
             branch=firefox_checkout['branch'],
             sparse_profile=firefox_checkout['sparse-profile'])
 
     elif not os.environ.get('GECKO_HEAD_REV') and \
             os.environ.get('GECKO_HEAD_REF'):
         print('task should be defined in terms of non-symbolic revision')
         return 1
 
-    tools_checkout = collect_vcs_options(args, 'tools')
-
-    if tools_checkout:
-        vcs_checkout('https://hg.mozilla.org/build/tools',
-                     tools_checkout['checkout'],
-                     os.environ['HG_STORE_PATH'],
-                     fetch_hgfingerprint=args.fetch_hgfingerprint,
-                     # Always check out the latest commit on default branch.
-                     # This is non-deterministic!
-                     branch='default',
-                     sparse_profile=tools_checkout['sparse-profile'])
-
     # Checkout the repository, setting the COMM_HEAD_REV to the current
     # revision hash. Revision hashes have priority over symbolic revisions. We
     # disallow running tasks with symbolic revisions unless they have been
     # resolved by a checkout.
     comm_checkout = collect_vcs_options(args, 'comm')
     if comm_checkout:
         os.environ['COMM_HEAD_REV'] = vcs_checkout(
             comm_checkout['head-repo'],
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -215,17 +215,16 @@ def mozharness_on_docker_worker_setup(co
     # Retry if mozharness returns TBPL_RETRY
     worker['retry-exit-status'] = [4]
 
     docker_worker_setup_secrets(config, job, taskdesc)
 
     command = [
         '{workdir}/bin/run-task'.format(**run),
         '--firefox-checkout', env['GECKO_PATH'],
-        '--tools-checkout', '{workdir}/workspace/build/tools'.format(**run),
     ]
     if run['comm-checkout']:
         command.append('--comm-checkout={workdir}/workspace/build/src/comm'.format(**run))
 
     command += [
         '--',
         '{workdir}/workspace/build/src/{script}'.format(
             workdir=run['workdir'],