Bug 1376550 - Add complete.mar to repackage tasks. r=dustin
Support OSX Signed nightlies (in the complete.mar too)
MozReview-Commit-ID: GnjEkcxabwr
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -86,51 +86,62 @@ def make_job_description(config, jobs):
treeherder = job.get('treeherder', {})
treeherder.setdefault('symbol', 'tc(Nr)')
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
treeherder.setdefault('tier', 1)
treeherder.setdefault('kind', 'build')
+ build_task = None
signing_task = None
for dependency in dependencies.keys():
if 'signing' in dependency:
signing_task = dependency
+ else:
+ build_task = dependency
signing_task_ref = "<{}>".format(signing_task)
+ build_task_ref = "<{}>".format(build_task)
attributes = {
'nightly': dep_job.attributes.get('nightly', False),
'build_platform': dep_job.attributes.get('build_platform'),
'build_type': dep_job.attributes.get('build_type'),
}
if job.get('locale'):
attributes['locale'] = job['locale']
level = config.params['level']
task_env = {}
locale_output_path = ""
+ mar_prefix = 'https://queue.taskcluster.net/v1/task/' + \
+ '{}/artifacts/public/build/host/bin/'.format(build_task_ref)
if attributes['build_platform'].startswith('macosx'):
if job.get('locale'):
input_string = 'https://queue.taskcluster.net/v1/task/' + \
'{}/artifacts/public/build/{}/target.tar.gz'
input_string = input_string.format(signing_task_ref, job['locale'])
locale_output_path = "{}/".format(job['locale'])
else:
input_string = 'https://queue.taskcluster.net/v1/task/' + \
'{}/artifacts/public/build/target.tar.gz'.format(signing_task_ref)
task_env.update(
SIGNED_INPUT={'task-reference': input_string},
+ UNSIGNED_MAR={'task-reference': "{}mar".format(mar_prefix)},
)
mozharness_config = ['repackage/osx_signed.py']
output_files = [{
'type': 'file',
'path': '/home/worker/workspace/build/artifacts/target.dmg',
'name': 'public/build/{}target.dmg'.format(locale_output_path),
+ }, {
+ 'type': 'file',
+ 'path': '/home/worker/workspace/build/artifacts/target.complete.mar',
+ 'name': 'public/build/{}target.complete.mar'.format(locale_output_path),
}]
else:
raise Exception("Unexpected build platform for repackage")
run = {
'using': 'mozharness',
'script': 'mozharness/scripts/repackage.py',
'config': mozharness_config,