Bug 1512285: Stop checking out tools; r=nthomas,gps
authorTom Prince <mozilla@hocat.ca>
Mon, 31 Dec 2018 18:52:28 +0000
changeset 509318 6e13c0c6c7c1fc5d45358c707e582726ec94b857
parent 509317 f861ce442580172136a58500837973efb06fdd08
child 509319 315bb83dabea111b7620b3c8ddb0b50d47c17052
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [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 This code was used by mozharness jobs to check out the tools repo. However, those jobs aren't actually using the repository. 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
@@ -520,29 +520,25 @@ def main(args):
     parser.add_argument('--user', default='worker', help='user to run as')
     parser.add_argument('--group', default='worker', help='group to run as')
     parser.add_argument('--gecko-checkout',
                         help='Directory where Gecko checkout should be created')
     parser.add_argument('--gecko-sparse-profile',
                         help='Path to sparse checkout profile to use')
     parser.add_argument('--comm-checkout',
                         help='Directory where Comm checkout should be created')
-    parser.add_argument('--tools-checkout',
-                        help='Directory where build/tools checkout should be created')
     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
     if args.gecko_checkout:
         args.gecko_checkout = os.path.expanduser(args.gecko_checkout)
-    if args.tools_checkout:
-        args.tools_checkout = os.path.expanduser(args.tools_checkout)
     if 'HG_STORE_PATH' in os.environ:
         os.environ['HG_STORE_PATH'] = os.path.expanduser(os.environ['HG_STORE_PATH'])
 
     uid = gid = gids = None
     if IS_POSIX and running_as_root:
         user, group, gids = get_posix_user_group(args.user, args.group)
         uid = user.pw_uid
         gid = group.gr_gid
@@ -666,18 +662,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.gecko_checkout)
-    prepare_checkout_dir(args.tools_checkout)
-    if args.gecko_checkout or args.tools_checkout or args.comm_checkout:
+    if args.gecko_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' % (
@@ -710,25 +705,16 @@ def main(args):
             branch=os.environ.get('GECKO_HEAD_REF'),
             sparse_profile=args.gecko_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
 
-    if args.tools_checkout:
-        vcs_checkout('https://hg.mozilla.org/build/tools',
-                     args.tools_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')
-
     # 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.
     if args.comm_checkout:
         base_repo = os.environ.get('COMM_BASE_REPOSITORY')
 
         os.environ['COMM_HEAD_REV'] = vcs_checkout(
--- 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),
         '--gecko-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'],