Bug 1512188 - Rename --sparse-profile to --gecko-sparse-profile; r=tomprince,dustin

We have multiple source checkouts. --sparse-profile is ambiguous
as to which one it could refer to. Let's rename the argument so it
is prefixed with the repo/project we are checking out.

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gregory Szorc 2018-12-31 18:52:26 +00:00
Родитель fe09099db1
Коммит 1693cc73d8
5 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -39,7 +39,7 @@ fi
# Build image
run-task \
--gecko-checkout "/builds/worker/checkouts/gecko" \
--sparse-profile build/sparse-profiles/docker-image \
--gecko-sparse-profile build/sparse-profiles/docker-image \
-- \
sh -x -c "$LOAD_COMMAND \
/builds/worker/checkouts/gecko/mach taskcluster-build-image \

Просмотреть файл

@ -521,7 +521,7 @@ def main(args):
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('--sparse-profile',
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')
@ -708,7 +708,7 @@ def main(args):
base_repo=base_repo,
revision=os.environ.get('GECKO_HEAD_REV'),
branch=os.environ.get('GECKO_HEAD_REF'),
sparse_profile=args.sparse_profile)
sparse_profile=args.gecko_sparse_profile)
elif not os.environ.get('GECKO_HEAD_REV') and \
os.environ.get('GECKO_HEAD_REF'):

Просмотреть файл

@ -49,7 +49,7 @@ def common_setup(config, job, taskdesc, command):
command.append('--gecko-checkout={}'.format(taskdesc['worker']['env']['GECKO_PATH']))
if run['sparse-profile']:
command.append('--sparse-profile=build/sparse-profiles/%s' %
command.append('--gecko-sparse-profile=build/sparse-profiles/%s' %
run['sparse-profile'])
taskdesc['worker'].setdefault('env', {})['MOZ_SCM_LEVEL'] = config.params['level']

Просмотреть файл

@ -152,7 +152,7 @@ def docker_worker_toolchain(config, job, taskdesc):
sparse_profile = []
if run.get('sparse-profile'):
sparse_profile = ['--sparse-profile=build/sparse-profiles/{}'
sparse_profile = ['--gecko-sparse-profile=build/sparse-profiles/{}'
.format(run['sparse-profile'])]
worker['command'] = [

Просмотреть файл

@ -1942,11 +1942,12 @@ def check_run_task_caches(config, tasks):
if arg == '--':
break
if arg.startswith('--sparse-profile'):
if arg.startswith('--gecko-sparse-profile'):
if '=' not in arg:
raise Exception(
'{} is specifying `--sparse-profile` to run-task as two arguments. '
'Unable to determine if the sparse profile exists.'.format(
'{} is specifying `--gecko-sparse-profile` to run-task '
'as two arguments. Unable to determine if the sparse '
'profile exists.'.format(
task['label']))
_, sparse_profile = arg.split('=', 1)
if not os.path.exists(os.path.join(GECKO, sparse_profile)):