Bug 1551738: Let should_use_artifact_map() not depend on the project anymore r=tomprince

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Johan Lorenzo 2019-05-20 01:32:38 +00:00
Родитель d18b0e21cf
Коммит dc2a0a1019
8 изменённых файлов: 16 добавлений и 54 удалений

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

@ -315,7 +315,7 @@ def make_task_worker(config, jobs):
signing_task_ref = "<" + str(signing_task) + ">"
build_task_ref = "<" + str(build_task) + ">"
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform, locale
)
@ -329,7 +329,7 @@ def make_task_worker(config, jobs):
'upstream-artifacts': upstream_artifacts,
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
worker['artifact-map'] = generate_beetmover_artifact_map(
config, job, platform=platform, locale=locale)

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

@ -145,7 +145,7 @@ def make_beetmover_checksums_worker(config, jobs):
'release-properties': craft_release_properties(config, job),
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform, locale
)

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

@ -138,7 +138,7 @@ def make_beetmover_checksums_worker(config, jobs):
'release-properties': craft_release_properties(config, job),
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform, locales
)

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

@ -358,7 +358,7 @@ def make_task_worker(config, jobs):
locale = job["attributes"].get("locale")
platform = job["attributes"]["build_platform"]
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform, locale)
else:
@ -373,7 +373,7 @@ def make_task_worker(config, jobs):
'upstream-artifacts': upstream_artifacts,
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
worker['artifact-map'] = generate_beetmover_artifact_map(
config, job, platform=platform, locale=locale)
@ -412,7 +412,7 @@ def make_partials_artifacts(config, jobs):
partials_info = get_partials_info_from_params(
config.params.get('release_history'), balrog_platform, locale)
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
job['worker']['artifact-map'].extend(
generate_beetmover_partials_artifact_map(
config, job, partials_info, platform=platform, locale=locale))

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

@ -137,7 +137,7 @@ def make_beetmover_checksums_worker(config, jobs):
raise NotImplementedError(
"Beetmover checksums must have a beetmover and signing dependency!")
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(config,
job, platform, locale)
else:
@ -149,7 +149,7 @@ def make_beetmover_checksums_worker(config, jobs):
'upstream-artifacts': upstream_artifacts,
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
worker['artifact-map'] = generate_beetmover_artifact_map(
config, job, platform=platform)

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

@ -125,7 +125,7 @@ def make_task_worker(config, jobs):
platform = job["attributes"]["build_platform"]
locale = job["attributes"]["chunk_locales"]
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform, locale,
)
@ -139,7 +139,7 @@ def make_task_worker(config, jobs):
'upstream-artifacts': upstream_artifacts,
}
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
job['worker']['artifact-map'] = generate_beetmover_artifact_map(
config, job, platform=platform, locale=locale)
@ -232,7 +232,7 @@ def _change_platform_data(config, platform_job, platform):
platform_job['worker']['release-properties']['platform'] = platform
# amend artifactMap entries as well
if should_use_artifact_map(backup_platform, config.params['project']):
if should_use_artifact_map(backup_platform):
platform_mapping = {
'linux64': 'linux-x86_64',
'linux': 'linux-i686',

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

@ -156,7 +156,7 @@ def make_task_worker(config, jobs):
platform = job["attributes"]["build_platform"]
# Works with Firefox/Devedition. Commented for migration.
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
upstream_artifacts = generate_beetmover_upstream_artifacts(
config, job, platform=None, locale=None
)
@ -168,7 +168,7 @@ def make_task_worker(config, jobs):
worker['upstream-artifacts'] = upstream_artifacts
# Works with Firefox/Devedition. Commented for migration.
if should_use_artifact_map(platform, config.params['project']):
if should_use_artifact_map(platform):
worker['artifact-map'] = generate_beetmover_artifact_map(
config, job, platform=platform)

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

@ -816,48 +816,10 @@ def generate_beetmover_partials_artifact_map(config, job, partials_info, **kwarg
return artifacts
# should_use_artifact_map {{{
def should_use_artifact_map(platform, project):
def should_use_artifact_map(platform):
"""Return True if this task uses the beetmover artifact map.
This function exists solely for the beetmover artifact map
migration.
"""
if 'linux64-snap-shippable' in platform:
# Snap has never been implemented outside of declarative artifacts. We need to use
# declarative artifacts no matter the branch we're on
return True
# FIXME: once we're ready to switch fully to declarative artifacts on other
# branches, we can expand this; for now, Fennec is rolled-out to all
# release branches, while Firefox only to mozilla-central
platforms = [
'android',
'fennec'
]
projects = ['mozilla-central', 'mozilla-beta', 'mozilla-release']
if any([pl in platform for pl in platforms]) and any([pj == project for pj in projects]):
return True
platforms = [
'linux', # needed for beetmover-langpacks-checksums
'linux64', # which inherit amended platform from their beetmover counterpart
'win32',
'win64',
'macosx64',
'linux-shippable',
'linux64-shippable',
'macosx64-shippable',
'win32-shippable',
'win64-shippable',
'win64-aarch64-shippable',
'win64-asan-reporter-nightly',
'linux64-asan-reporter-nightly',
'firefox-source',
'firefox-release',
]
projects = ['mozilla-central', 'mozilla-beta', 'mozilla-release']
if any([pl == platform for pl in platforms]) and any([pj == project for pj in projects]):
return True
return False
return 'devedition' not in platform