Skip to content

Commit

Permalink
Bug 1512188 - Rename --vcs-checkout to --gecko-checkout; r=tomprince,…
Browse files Browse the repository at this point in the history
…dustin

We now have multiple things we may check out. "vcs" meaning "gecko"
is not obvious. Let's change the terminology to be more specific.

Differential Revision: https://phabricator.services.mozilla.com/D13813

--HG--
extra : moz-landing-system : lando
  • Loading branch information
indygreg committed Dec 29, 2018
1 parent ddb8707 commit 8fc5669
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion taskcluster/docker/image_builder/build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi

# Build image
run-task \
--vcs-checkout "/builds/worker/checkouts/gecko" \
--gecko-checkout "/builds/worker/checkouts/gecko" \
--sparse-profile build/sparse-profiles/docker-image \
-- \
sh -x -c "$LOAD_COMMAND \
Expand Down
14 changes: 7 additions & 7 deletions taskcluster/scripts/run-task
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def main(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')
parser.add_argument('--vcs-checkout',
parser.add_argument('--gecko-checkout',
help='Directory where Gecko checkout should be created')
parser.add_argument('--sparse-profile',
help='Path to sparse checkout profile to use')
Expand All @@ -534,8 +534,8 @@ def main(args):
args = parser.parse_args(our_args)

# expand ~ in some paths
if args.vcs_checkout:
args.vcs_checkout = os.path.expanduser(args.vcs_checkout)
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:
Expand Down Expand Up @@ -670,9 +670,9 @@ def main(args):
if running_as_root:
os.chown(store_path, uid, gid)

prepare_checkout_dir(args.vcs_checkout)
prepare_checkout_dir(args.gecko_checkout)
prepare_checkout_dir(args.tools_checkout)
if args.vcs_checkout or args.tools_checkout or args.comm_checkout:
if args.gecko_checkout or args.tools_checkout or args.comm_checkout:
prepare_hg_store_path()

if IS_POSIX and running_as_root:
Expand All @@ -692,7 +692,7 @@ def main(args):
# 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.vcs_checkout:
if args.gecko_checkout:
base_repo = os.environ.get('GECKO_BASE_REPOSITORY')
# Some callers set the base repository to mozilla-central for historical
# reasons. Switch to mozilla-unified because robustcheckout works best
Expand All @@ -702,7 +702,7 @@ def main(args):

os.environ['GECKO_HEAD_REV'] = vcs_checkout(
os.environ['GECKO_HEAD_REPOSITORY'],
args.vcs_checkout,
args.gecko_checkout,
os.environ['HG_STORE_PATH'],
fetch_hgfingerprint=args.fetch_hgfingerprint,
base_repo=base_repo,
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/hazard.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def docker_worker_hazard(config, job, taskdesc):

worker['command'] = [
'{workdir}/bin/run-task'.format(**run),
'--vcs-checkout', '{workdir}/checkouts/gecko'.format(**run),
'--gecko-checkout', '{workdir}/checkouts/gecko'.format(**run),
'--',
'/bin/bash', '-c', run['command']
]
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/mozharness.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):

command = [
'{workdir}/bin/run-task'.format(**run),
'--vcs-checkout', env['GECKO_PATH'],
'--gecko-checkout', env['GECKO_PATH'],
'--tools-checkout', '{workdir}/workspace/build/tools'.format(**run),
]
if run['comm-checkout']:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/mozharness_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
# If we have a source checkout, run mozharness from it instead of
# downloading a zip file with the same content.
if test['checkout']:
command.extend(['--vcs-checkout', '{workdir}/checkouts/gecko'.format(**run)])
command.extend(['--gecko-checkout', '{workdir}/checkouts/gecko'.format(**run)])
env['MOZHARNESS_PATH'] = '{workdir}/checkouts/gecko/testing/mozharness'.format(**run)
else:
env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/run_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def common_setup(config, job, taskdesc, command):
if run['checkout']:
support_vcs_checkout(config, job, taskdesc,
sparse=bool(run['sparse-profile']))
command.append('--vcs-checkout={}'.format(taskdesc['worker']['env']['GECKO_PATH']))
command.append('--gecko-checkout={}'.format(taskdesc['worker']['env']['GECKO_PATH']))

if run['sparse-profile']:
command.append('--sparse-profile=build/sparse-profiles/%s' %
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/spidermonkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def docker_worker_spidermonkey(config, job, taskdesc):

worker['command'] = [
'{workdir}/bin/run-task'.format(**run),
'--vcs-checkout', '{workdir}/workspace/build/src'.format(**run),
'--gecko-checkout', '{workdir}/workspace/build/src'.format(**run),
'--',
'/bin/bash',
'-c',
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/taskgraph/transforms/job/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def docker_worker_toolchain(config, job, taskdesc):

worker['command'] = [
'{workdir}/bin/run-task'.format(**run),
'--vcs-checkout={}'.format(gecko_path),
'--gecko-checkout={}'.format(gecko_path),
] + sparse_profile + [
'--',
'bash',
Expand Down

0 comments on commit 8fc5669

Please sign in to comment.