зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1607857: [partials] Don't pass platform to funsize; r=sfraser
The only thing it used it for was for a default filename, but we always pass an explicit name, so remove the platform option and the default filename. Differential Revision: https://phabricator.services.mozilla.com/D59399 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
795cf400a0
Коммит
7ab5279101
|
@ -53,10 +53,6 @@ else
|
||||||
export MBSDIFF_HOOK=
|
export MBSDIFF_HOOK=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$FILENAME_TEMPLATE" ]; then
|
|
||||||
EXTRA_PARAMS="--filename-template $FILENAME_TEMPLATE $EXTRA_PARAMS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# EXTRA_PARAMS is optional
|
# EXTRA_PARAMS is optional
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
pipenv run /home/worker/bin/funsize.py \
|
pipenv run /home/worker/bin/funsize.py \
|
||||||
|
|
|
@ -46,9 +46,6 @@ STAGING_URL_PREFIXES = (
|
||||||
"https://ftp.stage.mozaws.net/",
|
"https://ftp.stage.mozaws.net/",
|
||||||
)
|
)
|
||||||
|
|
||||||
DEFAULT_FILENAME_TEMPLATE = "{appName}-{branch}-{version}-{platform}-" \
|
|
||||||
"{locale}-{from_buildid}-{to_buildid}.partial.mar"
|
|
||||||
|
|
||||||
BCJ_OPTIONS = {
|
BCJ_OPTIONS = {
|
||||||
'x86': ['--x86'],
|
'x86': ['--x86'],
|
||||||
'x86_64': ['--x86'],
|
'x86_64': ['--x86'],
|
||||||
|
@ -218,7 +215,6 @@ async def generate_partial(work_env, from_dir, to_dir, dest_mar, mar_data,
|
||||||
env["MOZ_PRODUCT_VERSION"] = mar_data['version']
|
env["MOZ_PRODUCT_VERSION"] = mar_data['version']
|
||||||
env["MAR_CHANNEL_ID"] = mar_data["MAR_CHANNEL_ID"]
|
env["MAR_CHANNEL_ID"] = mar_data["MAR_CHANNEL_ID"]
|
||||||
env['BRANCH'] = mar_data['branch']
|
env['BRANCH'] = mar_data['branch']
|
||||||
env['PLATFORM'] = mar_data['platform']
|
|
||||||
if use_old_format:
|
if use_old_format:
|
||||||
env['MAR_OLD_FORMAT'] = '1'
|
env['MAR_OLD_FORMAT'] = '1'
|
||||||
elif 'MAR_OLD_FORMAT' in env:
|
elif 'MAR_OLD_FORMAT' in env:
|
||||||
|
@ -292,7 +288,7 @@ def verify_allowed_url(mar, allowed_url_prefixes):
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
async def manage_partial(partial_def, filename_template, artifacts_dir,
|
async def manage_partial(partial_def, artifacts_dir,
|
||||||
allowed_url_prefixes, signing_certs, arch=None):
|
allowed_url_prefixes, signing_certs, arch=None):
|
||||||
"""Manage the creation of partial mars based on payload."""
|
"""Manage the creation of partial mars based on payload."""
|
||||||
|
|
||||||
|
@ -359,7 +355,6 @@ async def manage_partial(partial_def, filename_template, artifacts_dir,
|
||||||
section="Build", option="SourceStamp"),
|
section="Build", option="SourceStamp"),
|
||||||
"from_mar": partial_def["from_mar"],
|
"from_mar": partial_def["from_mar"],
|
||||||
"to_mar": partial_def["to_mar"],
|
"to_mar": partial_def["to_mar"],
|
||||||
"platform": partial_def["platform"],
|
|
||||||
"locale": partial_def["locale"],
|
"locale": partial_def["locale"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -375,11 +370,7 @@ async def manage_partial(partial_def, filename_template, artifacts_dir,
|
||||||
# if branch not set explicitly use repo-name
|
# if branch not set explicitly use repo-name
|
||||||
mar_data['branch'] = partial_def.get('branch', mar_data['repo'].rstrip('/').split('/')[-1])
|
mar_data['branch'] = partial_def.get('branch', mar_data['repo'].rstrip('/').split('/')[-1])
|
||||||
|
|
||||||
if 'dest_mar' in partial_def:
|
mar_name = partial_def['dest_mar']
|
||||||
mar_name = partial_def['dest_mar']
|
|
||||||
else:
|
|
||||||
# default to formatted name if not specified
|
|
||||||
mar_name = filename_template.format(**mar_data)
|
|
||||||
|
|
||||||
mar_data['mar'] = mar_name
|
mar_data['mar'] = mar_name
|
||||||
dest_mar = os.path.join(work_env.workdir, mar_name)
|
dest_mar = os.path.join(work_env.workdir, mar_name)
|
||||||
|
@ -419,7 +410,6 @@ async def async_main(args, signing_certs):
|
||||||
),
|
),
|
||||||
kwargs=dict(
|
kwargs=dict(
|
||||||
partial_def=definition,
|
partial_def=definition,
|
||||||
filename_template=args.filename_template,
|
|
||||||
artifacts_dir=args.artifacts_dir,
|
artifacts_dir=args.artifacts_dir,
|
||||||
allowed_url_prefixes=allowed_url_prefixes,
|
allowed_url_prefixes=allowed_url_prefixes,
|
||||||
signing_certs=signing_certs,
|
signing_certs=signing_certs,
|
||||||
|
@ -442,8 +432,6 @@ def main():
|
||||||
default=strtobool(
|
default=strtobool(
|
||||||
os.environ.get('FUNSIZE_ALLOW_STAGING_PREFIXES', "false")),
|
os.environ.get('FUNSIZE_ALLOW_STAGING_PREFIXES', "false")),
|
||||||
help="Allow files from staging buckets.")
|
help="Allow files from staging buckets.")
|
||||||
parser.add_argument("--filename-template",
|
|
||||||
default=DEFAULT_FILENAME_TEMPLATE)
|
|
||||||
parser.add_argument("-q", "--quiet", dest="log_level",
|
parser.add_argument("-q", "--quiet", dest="log_level",
|
||||||
action="store_const", const=logging.WARNING,
|
action="store_const", const=logging.WARNING,
|
||||||
default=logging.DEBUG)
|
default=logging.DEBUG)
|
||||||
|
|
|
@ -8,7 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals
|
||||||
|
|
||||||
from taskgraph.transforms.base import TransformSequence
|
from taskgraph.transforms.base import TransformSequence
|
||||||
from taskgraph.util.attributes import copy_attributes_from_dependent_job
|
from taskgraph.util.attributes import copy_attributes_from_dependent_job
|
||||||
from taskgraph.util.partials import get_balrog_platform_name, get_builds
|
from taskgraph.util.partials import get_builds
|
||||||
from taskgraph.util.platforms import architecture
|
from taskgraph.util.platforms import architecture
|
||||||
from taskgraph.util.taskcluster import get_artifact_prefix
|
from taskgraph.util.taskcluster import get_artifact_prefix
|
||||||
|
|
||||||
|
@ -90,7 +90,6 @@ def make_task_description(config, jobs):
|
||||||
'locale': build_locale,
|
'locale': build_locale,
|
||||||
'from_mar': builds[build]['mar_url'],
|
'from_mar': builds[build]['mar_url'],
|
||||||
'to_mar': {'artifact-reference': artifact_path},
|
'to_mar': {'artifact-reference': artifact_path},
|
||||||
'platform': get_balrog_platform_name(dep_th_platform),
|
|
||||||
'branch': config.params['project'],
|
'branch': config.params['project'],
|
||||||
'update_number': update_number,
|
'update_number': update_number,
|
||||||
'dest_mar': build,
|
'dest_mar': build,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче