зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1512188 - Rename --vcs-checkout to --firefox-checkout; r=tomprince
We now have multiple things we may check out. "vcs" meaning "firefox" 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
This commit is contained in:
Родитель
f91504311e
Коммит
3c6f34daeb
|
@ -38,7 +38,7 @@ fi
|
||||||
|
|
||||||
# Build image
|
# Build image
|
||||||
run-task \
|
run-task \
|
||||||
--vcs-checkout "/builds/worker/checkouts/gecko" \
|
--firefox-checkout "/builds/worker/checkouts/gecko" \
|
||||||
--sparse-profile build/sparse-profiles/docker-image \
|
--sparse-profile build/sparse-profiles/docker-image \
|
||||||
-- \
|
-- \
|
||||||
sh -x -c "$LOAD_COMMAND \
|
sh -x -c "$LOAD_COMMAND \
|
||||||
|
|
|
@ -515,8 +515,8 @@ def main(args):
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument('--user', default='worker', help='user to run as')
|
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('--group', default='worker', help='group to run as')
|
||||||
parser.add_argument('--vcs-checkout',
|
parser.add_argument('--firefox-checkout',
|
||||||
help='Directory where Gecko checkout should be created')
|
help='Directory where Firefox checkout should be created')
|
||||||
parser.add_argument('--sparse-profile',
|
parser.add_argument('--sparse-profile',
|
||||||
help='Path to sparse checkout profile to use')
|
help='Path to sparse checkout profile to use')
|
||||||
parser.add_argument('--comm-checkout',
|
parser.add_argument('--comm-checkout',
|
||||||
|
@ -530,8 +530,8 @@ def main(args):
|
||||||
args = parser.parse_args(our_args)
|
args = parser.parse_args(our_args)
|
||||||
|
|
||||||
# expand ~ in some paths
|
# expand ~ in some paths
|
||||||
if args.vcs_checkout:
|
if args.firefox_checkout:
|
||||||
args.vcs_checkout = os.path.expanduser(args.vcs_checkout)
|
args.firefox_checkout = os.path.expanduser(args.firefox_checkout)
|
||||||
if args.tools_checkout:
|
if args.tools_checkout:
|
||||||
args.tools_checkout = os.path.expanduser(args.tools_checkout)
|
args.tools_checkout = os.path.expanduser(args.tools_checkout)
|
||||||
if 'HG_STORE_PATH' in os.environ:
|
if 'HG_STORE_PATH' in os.environ:
|
||||||
|
@ -666,9 +666,9 @@ def main(args):
|
||||||
if running_as_root:
|
if running_as_root:
|
||||||
os.chown(store_path, uid, gid)
|
os.chown(store_path, uid, gid)
|
||||||
|
|
||||||
prepare_checkout_dir(args.vcs_checkout)
|
prepare_checkout_dir(args.firefox_checkout)
|
||||||
prepare_checkout_dir(args.tools_checkout)
|
prepare_checkout_dir(args.tools_checkout)
|
||||||
if args.vcs_checkout or args.tools_checkout or args.comm_checkout:
|
if args.firefox_checkout or args.tools_checkout or args.comm_checkout:
|
||||||
prepare_hg_store_path()
|
prepare_hg_store_path()
|
||||||
|
|
||||||
if IS_POSIX and running_as_root:
|
if IS_POSIX and running_as_root:
|
||||||
|
@ -688,7 +688,7 @@ def main(args):
|
||||||
# revision hash. Revision hashes have priority over symbolic revisions. We
|
# revision hash. Revision hashes have priority over symbolic revisions. We
|
||||||
# disallow running tasks with symbolic revisions unless they have been
|
# disallow running tasks with symbolic revisions unless they have been
|
||||||
# resolved by a checkout.
|
# resolved by a checkout.
|
||||||
if args.vcs_checkout:
|
if args.firefox_checkout:
|
||||||
base_repo = os.environ.get('GECKO_BASE_REPOSITORY')
|
base_repo = os.environ.get('GECKO_BASE_REPOSITORY')
|
||||||
# Some callers set the base repository to mozilla-central for historical
|
# Some callers set the base repository to mozilla-central for historical
|
||||||
# reasons. Switch to mozilla-unified because robustcheckout works best
|
# reasons. Switch to mozilla-unified because robustcheckout works best
|
||||||
|
@ -698,7 +698,7 @@ def main(args):
|
||||||
|
|
||||||
os.environ['GECKO_HEAD_REV'] = vcs_checkout(
|
os.environ['GECKO_HEAD_REV'] = vcs_checkout(
|
||||||
os.environ['GECKO_HEAD_REPOSITORY'],
|
os.environ['GECKO_HEAD_REPOSITORY'],
|
||||||
args.vcs_checkout,
|
args.firefox_checkout,
|
||||||
os.environ['HG_STORE_PATH'],
|
os.environ['HG_STORE_PATH'],
|
||||||
fetch_hgfingerprint=args.fetch_hgfingerprint,
|
fetch_hgfingerprint=args.fetch_hgfingerprint,
|
||||||
base_repo=base_repo,
|
base_repo=base_repo,
|
||||||
|
|
|
@ -69,7 +69,7 @@ def docker_worker_hazard(config, job, taskdesc):
|
||||||
|
|
||||||
worker['command'] = [
|
worker['command'] = [
|
||||||
'{workdir}/bin/run-task'.format(**run),
|
'{workdir}/bin/run-task'.format(**run),
|
||||||
'--vcs-checkout', '{workdir}/checkouts/gecko'.format(**run),
|
'--firefox-checkout', '{workdir}/checkouts/gecko'.format(**run),
|
||||||
'--',
|
'--',
|
||||||
'/bin/bash', '-c', run['command']
|
'/bin/bash', '-c', run['command']
|
||||||
]
|
]
|
||||||
|
|
|
@ -219,7 +219,7 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
|
||||||
|
|
||||||
command = [
|
command = [
|
||||||
'{workdir}/bin/run-task'.format(**run),
|
'{workdir}/bin/run-task'.format(**run),
|
||||||
'--vcs-checkout', env['GECKO_PATH'],
|
'--firefox-checkout', env['GECKO_PATH'],
|
||||||
'--tools-checkout', '{workdir}/workspace/build/tools'.format(**run),
|
'--tools-checkout', '{workdir}/workspace/build/tools'.format(**run),
|
||||||
]
|
]
|
||||||
if run['comm-checkout']:
|
if run['comm-checkout']:
|
||||||
|
|
|
@ -140,7 +140,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
|
||||||
# If we have a source checkout, run mozharness from it instead of
|
# If we have a source checkout, run mozharness from it instead of
|
||||||
# downloading a zip file with the same content.
|
# downloading a zip file with the same content.
|
||||||
if test['checkout']:
|
if test['checkout']:
|
||||||
command.extend(['--vcs-checkout', '{workdir}/checkouts/gecko'.format(**run)])
|
command.extend(['--firefox-checkout', '{workdir}/checkouts/gecko'.format(**run)])
|
||||||
env['MOZHARNESS_PATH'] = '{workdir}/checkouts/gecko/testing/mozharness'.format(**run)
|
env['MOZHARNESS_PATH'] = '{workdir}/checkouts/gecko/testing/mozharness'.format(**run)
|
||||||
else:
|
else:
|
||||||
env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}
|
env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}
|
||||||
|
|
|
@ -46,7 +46,7 @@ def common_setup(config, job, taskdesc, command, geckodir):
|
||||||
if run['checkout']:
|
if run['checkout']:
|
||||||
support_vcs_checkout(config, job, taskdesc,
|
support_vcs_checkout(config, job, taskdesc,
|
||||||
sparse=bool(run['sparse-profile']))
|
sparse=bool(run['sparse-profile']))
|
||||||
command.append('--vcs-checkout={}'.format(geckodir))
|
command.append('--firefox-checkout={}'.format(geckodir))
|
||||||
|
|
||||||
if run['sparse-profile']:
|
if run['sparse-profile']:
|
||||||
command.append('--sparse-profile=build/sparse-profiles/%s' %
|
command.append('--sparse-profile=build/sparse-profiles/%s' %
|
||||||
|
|
|
@ -73,7 +73,7 @@ def docker_worker_spidermonkey(config, job, taskdesc):
|
||||||
|
|
||||||
worker['command'] = [
|
worker['command'] = [
|
||||||
'{workdir}/bin/run-task'.format(**run),
|
'{workdir}/bin/run-task'.format(**run),
|
||||||
'--vcs-checkout', '{workdir}/workspace/build/src'.format(**run),
|
'--firefox-checkout', '{workdir}/workspace/build/src'.format(**run),
|
||||||
'--',
|
'--',
|
||||||
'/bin/bash',
|
'/bin/bash',
|
||||||
'-c',
|
'-c',
|
||||||
|
|
|
@ -157,7 +157,7 @@ def docker_worker_toolchain(config, job, taskdesc):
|
||||||
|
|
||||||
worker['command'] = [
|
worker['command'] = [
|
||||||
'{workdir}/bin/run-task'.format(**run),
|
'{workdir}/bin/run-task'.format(**run),
|
||||||
'--vcs-checkout={}'.format(gecko_path),
|
'--firefox-checkout={}'.format(gecko_path),
|
||||||
] + sparse_profile + [
|
] + sparse_profile + [
|
||||||
'--',
|
'--',
|
||||||
'bash',
|
'bash',
|
||||||
|
|
Загрузка…
Ссылка в новой задаче