Bug 1624910 - fix partner repacks after bug 1527313. r=tomprince

Differential Revision: https://phabricator.services.mozilla.com/D68245

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Julien Cristau 2020-03-25 21:13:07 +00:00
parent b9a1da8820
commit db7f4cc73e

View File

@ -273,7 +273,7 @@ def _generate_task_output_files(task, worker_implementation, repackage_config, p
if worker_implementation == ('docker-worker', 'linux'): if worker_implementation == ('docker-worker', 'linux'):
local_prefix = '/builds/worker/workspace/' local_prefix = '/builds/worker/workspace/'
elif worker_implementation == ('generic-worker', 'windows'): elif worker_implementation == ('generic-worker', 'windows'):
local_prefix = '' local_prefix = 'workspace/'
else: else:
raise NotImplementedError( raise NotImplementedError(
'Unsupported worker implementation: "{}"'.format(worker_implementation)) 'Unsupported worker implementation: "{}"'.format(worker_implementation))
@ -282,7 +282,7 @@ def _generate_task_output_files(task, worker_implementation, repackage_config, p
for config in repackage_config: for config in repackage_config:
output_files.append({ output_files.append({
'type': 'file', 'type': 'file',
'path': '{}build/outputs/{}{}' 'path': '{}outputs/{}{}'
.format(local_prefix, partner_output_path, config['output']), .format(local_prefix, partner_output_path, config['output']),
'name': '{}/{}{}'.format(artifact_prefix, partner_output_path, config['output']), 'name': '{}/{}{}'.format(artifact_prefix, partner_output_path, config['output']),
}) })