Fixes "assemble raptor" task failing to upload artifacts (#2258)
parent
e04d7837b3
commit
db203148b8
|
@ -54,7 +54,7 @@ def pr_or_push(is_push):
|
||||||
print("Exit")
|
print("Exit")
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
variants = get_build_variants()
|
debug_variants = [variant for variant in get_build_variants() if variant.endswith('Debug')]
|
||||||
geckoview_nightly_version = get_geckoview_versions()['nightly']
|
geckoview_nightly_version = get_geckoview_versions()['nightly']
|
||||||
mozharness_task_id = fetch_mozharness_task_id(geckoview_nightly_version)
|
mozharness_task_id = fetch_mozharness_task_id(geckoview_nightly_version)
|
||||||
gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']
|
gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']
|
||||||
|
@ -63,19 +63,15 @@ def pr_or_push(is_push):
|
||||||
signing_tasks = {}
|
signing_tasks = {}
|
||||||
other_tasks = {}
|
other_tasks = {}
|
||||||
|
|
||||||
for variant in variants:
|
for variant in debug_variants:
|
||||||
assemble_task_id = taskcluster.slugId()
|
assemble_task_id = taskcluster.slugId()
|
||||||
build_tasks[assemble_task_id] = BUILDER.craft_assemble_task(variant)
|
build_tasks[assemble_task_id] = BUILDER.craft_assemble_task(variant)
|
||||||
build_tasks[taskcluster.slugId()] = BUILDER.craft_test_task(variant)
|
build_tasks[taskcluster.slugId()] = BUILDER.craft_test_task(variant)
|
||||||
|
|
||||||
architecture, build_type = get_architecture_and_build_type_from_variant(variant)
|
if is_push and SHORT_HEAD_BRANCH == 'master':
|
||||||
# autophone only supports arm and aarch64, so only sign/perftest those builds
|
for variant in ('armRaptor', 'aarch64Raptor'):
|
||||||
if (
|
assemble_task_id = taskcluster.slugId()
|
||||||
is_push and
|
build_tasks[assemble_task_id] = BUILDER.craft_assemble_task(variant)
|
||||||
build_type == 'raptor' and
|
|
||||||
architecture in ('arm', 'aarch64') and
|
|
||||||
SHORT_HEAD_BRANCH == 'master'
|
|
||||||
):
|
|
||||||
signing_task_id = taskcluster.slugId()
|
signing_task_id = taskcluster.slugId()
|
||||||
signing_tasks[signing_task_id] = BUILDER.craft_raptor_signing_task(assemble_task_id, variant)
|
signing_tasks[signing_task_id] = BUILDER.craft_raptor_signing_task(assemble_task_id, variant)
|
||||||
|
|
||||||
|
|
|
@ -348,18 +348,17 @@ class TaskBuilder(object):
|
||||||
routes = []
|
routes = []
|
||||||
if self.repo_url == _OFFICIAL_REPO_URL:
|
if self.repo_url == _OFFICIAL_REPO_URL:
|
||||||
routes = [
|
routes = [
|
||||||
'index.project.mobile.fenix.v2.branch.master.revision.{}.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.revision.{}.raptor.{}'.format(
|
||||||
self.commit, 'raptor', architecture
|
self.commit, architecture
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.latest.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.latest.raptor.{}'.format(
|
||||||
'raptor', architecture
|
architecture
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.revision.{}.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.revision.{}.raptor.{}'.format(
|
||||||
self.date.year, self.date.month, self.date.day, self.commit,
|
self.date.year, self.date.month, self.date.day, self.commit, architecture
|
||||||
'raptor', architecture
|
|
||||||
),
|
),
|
||||||
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.latest.{}.{}'.format(
|
'index.project.mobile.fenix.v2.branch.master.pushdate.{}.{}.{}.latest.raptor.{}'.format(
|
||||||
self.date.year, self.date.month, self.date.day, 'raptor', architecture
|
self.date.year, self.date.month, self.date.day, architecture
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -582,7 +581,7 @@ def _craft_artifacts_from_variant(variant):
|
||||||
|
|
||||||
def _craft_apk_full_path_from_variant(variant):
|
def _craft_apk_full_path_from_variant(variant):
|
||||||
architecture, build_type = get_architecture_and_build_type_from_variant(variant)
|
architecture, build_type = get_architecture_and_build_type_from_variant(variant)
|
||||||
postfix = '-unsigned' if build_type.startswith('release') else ''
|
postfix = '' if build_type == 'debug' else '-unsigned'
|
||||||
return '/opt/fenix/app/build/outputs/apk/{architecture}/{build_type}/app-{architecture}-{build_type}{postfix}.apk'.format( # noqa: E501
|
return '/opt/fenix/app/build/outputs/apk/{architecture}/{build_type}/app-{architecture}-{build_type}{postfix}.apk'.format( # noqa: E501
|
||||||
architecture=architecture,
|
architecture=architecture,
|
||||||
build_type=build_type,
|
build_type=build_type,
|
||||||
|
|
Loading…
Reference in New Issue