corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1442793 - pushapk artifact_prefix r=bhearsum

Browse Source 
MozReview-Commit-ID: 8NMgi5B8Ls8
This commit is contained in:
Aki Sasaki
2018-03-21 18:55:08 -07:00
parent e042df0476
commit fea80dfb51
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
taskcluster/taskgraph/transforms/push_apk.py
View File

@@ -13,6 +13,7 @@ from taskgraph.transforms.base import TransformSequence
from taskgraph.transforms.task import task_description_schema 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.schema import optionally_keyed_by, resolve_keyed_by, Schema, validate_schema
from taskgraph.util.scriptworker import get_push_apk_scope from taskgraph.util.scriptworker import get_push_apk_scope
from taskgraph.util.taskcluster import get_artifact_prefix
from voluptuous import Optional, Required from voluptuous import Optional, Required
@@ -85,7 +86,9 @@ Given dependencies: {}.
def make_task_description(config, jobs): def make_task_description(config, jobs):
for job in jobs: for job in jobs:
job['dependencies'] = generate_dependencies(job['dependent-tasks']) 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 # Use the rc-google-play-track and rc-rollout-percentage in RC relpro flavors
if config.params['release_type'] == 'rc': if config.params['release_type'] == 'rc':
@@ -128,11 +131,12 @@ def generate_dependencies(dependent_tasks):
return dependencies return dependencies
def generate_upstream_artifacts(dependencies): def generate_upstream_artifacts(job, dependencies):
artifact_prefix = get_artifact_prefix(job)
apks = [{ apks = [{
'taskId': {'task-reference': '<{}>'.format(task_kind)}, 'taskId': {'task-reference': '<{}>'.format(task_kind)},
'taskType': 'signing', 'taskType': 'signing',
'paths': ['public/build/target.apk'], 'paths': ['{}/target.apk'.format(artifact_prefix)],
} for task_kind in dependencies.keys() } for task_kind in dependencies.keys()
if task_kind not in ('google-play-strings', 'beetmover-checksums') if task_kind not in ('google-play-strings', 'beetmover-checksums')
] ]