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

bug 1442793 - partials artifact_prefix. r=bhearsum

Browse Source 
MozReview-Commit-ID: 2XL2OEpVyWO
This commit is contained in:
Aki Sasaki
2018-03-21 15:13:57 -07:00
parent 4792c705f2
commit e042df0476
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taskcluster/taskgraph/transforms/partials.py
View File

@@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence from taskgraph.transforms.base import TransformSequence
from taskgraph.util.attributes import copy_attributes_from_dependent_job from taskgraph.util.attributes import copy_attributes_from_dependent_job
from taskgraph.util.partials import get_balrog_platform_name, get_builds from taskgraph.util.partials import get_balrog_platform_name, get_builds
from taskgraph.util.taskcluster import get_taskcluster_artifact_prefix from taskgraph.util.taskcluster import get_taskcluster_artifact_prefix, get_artifact_prefix
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -17,20 +17,21 @@ logger = logging.getLogger(__name__)
transforms = TransformSequence() transforms = TransformSequence()
def _generate_task_output_files(filenames, locale=None): def _generate_task_output_files(job, filenames, locale=None):
locale_output_path = '{}/'.format(locale) if locale else '' locale_output_path = '{}/'.format(locale) if locale else ''
artifact_prefix = get_artifact_prefix(job)
data = list() data = list()
for filename in filenames: for filename in filenames:
data.append({ data.append({
'type': 'file', 'type': 'file',
'path': '/home/worker/artifacts/{}'.format(filename), 'path': '/home/worker/artifacts/{}'.format(filename),
'name': 'public/build/{}{}'.format(locale_output_path, filename) 'name': '{}/{}{}'.format(artifact_prefix, locale_output_path, filename)
}) })
data.append({ data.append({
'type': 'file', 'type': 'file',
'path': '/home/worker/artifacts/manifest.json', 'path': '/home/worker/artifacts/manifest.json',
'name': 'public/build/{}manifest.json'.format(locale_output_path) 'name': '{}/{}manifest.json'.format(artifact_prefix, locale_output_path)
}) })
return data return data
@@ -122,7 +123,7 @@ def make_task_description(config, jobs):
mar_channel_id = 'firefox-mozilla-esr' mar_channel_id = 'firefox-mozilla-esr'
worker = { worker = {
'artifacts': _generate_task_output_files(builds.keys(), locale), 'artifacts': _generate_task_output_files(dep_job, builds.keys(), locale),
'implementation': 'docker-worker', 'implementation': 'docker-worker',
'docker-image': {'in-tree': 'funsize-update-generator'}, 'docker-image': {'in-tree': 'funsize-update-generator'},
'os': 'linux', 'os': 'linux',