From fea80dfb51a70ceb871386c7aab9fb396e4f255e Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Wed, 21 Mar 2018 18:55:08 -0700 Subject: [PATCH] bug 1442793 - pushapk artifact_prefix r=bhearsum MozReview-Commit-ID: 8NMgi5B8Ls8 --- taskcluster/taskgraph/transforms/push_apk.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/taskcluster/taskgraph/transforms/push_apk.py b/taskcluster/taskgraph/transforms/push_apk.py index 186f43c69c67..a8386125a66d 100644 --- a/taskcluster/taskgraph/transforms/push_apk.py +++ b/taskcluster/taskgraph/transforms/push_apk.py @@ -13,6 +13,7 @@ from taskgraph.transforms.base import TransformSequence from taskgraph.transforms.task import task_description_schema from taskgraph.util.schema import optionally_keyed_by, resolve_keyed_by, Schema, validate_schema from taskgraph.util.scriptworker import get_push_apk_scope +from taskgraph.util.taskcluster import get_artifact_prefix from voluptuous import Optional, Required @@ -85,7 +86,9 @@ Given dependencies: {}. def make_task_description(config, jobs): for job in jobs: job['dependencies'] = generate_dependencies(job['dependent-tasks']) - job['worker']['upstream-artifacts'] = generate_upstream_artifacts(job['dependencies']) + job['worker']['upstream-artifacts'] = generate_upstream_artifacts( + job, job['dependencies'] + ) # Use the rc-google-play-track and rc-rollout-percentage in RC relpro flavors if config.params['release_type'] == 'rc': @@ -128,11 +131,12 @@ def generate_dependencies(dependent_tasks): return dependencies -def generate_upstream_artifacts(dependencies): +def generate_upstream_artifacts(job, dependencies): + artifact_prefix = get_artifact_prefix(job) apks = [{ 'taskId': {'task-reference': '<{}>'.format(task_kind)}, 'taskType': 'signing', - 'paths': ['public/build/target.apk'], + 'paths': ['{}/target.apk'.format(artifact_prefix)], } for task_kind in dependencies.keys() if task_kind not in ('google-play-strings', 'beetmover-checksums') ]