From 39fa62b22b18b6740ad1d022c407c4fa2e2b60ab Mon Sep 17 00:00:00 2001 From: Mitchell Hentges Date: Mon, 15 Jul 2019 09:59:54 -0700 Subject: [PATCH] Moves artifact ABI information to directory name (#3908) --- automation/taskcluster/decision_task.py | 4 ++-- automation/taskcluster/lib/tasks.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py index 31735420a..1bf3643f9 100644 --- a/automation/taskcluster/decision_task.py +++ b/automation/taskcluster/decision_task.py @@ -109,7 +109,7 @@ def raptor(is_staging): def release(channel, is_staging, version_name): variants = get_variants_for_build_type(channel) architectures = [variant.abi for variant in variants] - apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures] + apk_paths = ["public/build/{}/target.apk".format(arch) for arch in architectures] build_tasks = {} signing_tasks = {} @@ -146,7 +146,7 @@ def nightly_to_production_app(is_staging, version_name): build_type = 'nightlyLegacy' variants = get_variants_for_build_type(build_type) architectures = [variant.abi for variant in variants] - apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures] + apk_paths = ["public/build/{}/target.apk".format(arch) for arch in architectures] build_tasks = {} signing_tasks = {} diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index 9748fe144..18e71dd0f 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -42,7 +42,7 @@ class TaskBuilder(object): def craft_assemble_release_task(self, architectures, build_type, is_staging, version_name): artifacts = { - 'public/target.{}.apk'.format(arch): { + 'public/build/{}/target.apk'.format(arch): { "type": 'file', "path": '/opt/fenix/app/build/outputs/apk/' '{arch}/{build_type}/app-{arch}-{build_type}-unsigned.apk'.format(arch=arch, build_type=build_type), @@ -411,7 +411,7 @@ class TaskBuilder(object): description='Dep-signing variant {}'.format(variant.raw), signing_type="dep", assemble_task_id=assemble_task_id, - apk_paths=["public/target.apk"], + apk_paths=[DEFAULT_APK_ARTIFACT_LOCATION], routes=routes, treeherder={ 'groupSymbol': variant.build_type,