bug 1442793 - repackage_signing artifact_prefix. r?bhearsum draft
authorAki Sasaki <asasaki@mozilla.com>
Wed, 07 Mar 2018 12:51:02 -0800
changeset 782021 e963676946e1962f42ba0a471c2be7fa6d5ee2c9
parent 782020 a57b646878b0fef6d88e1f71ac0a9b33112e247f
child 782022 0a8a69115ec02a8a62f29bf191044a27b71e3192
push id106465
push userasasaki@mozilla.com
push dateSat, 14 Apr 2018 00:42:17 +0000
reviewersbhearsum
bugs1442793
milestone61.0a1
bug 1442793 - repackage_signing artifact_prefix. r?bhearsum MozReview-Commit-ID: 10aQShA2xZJ
taskcluster/taskgraph/transforms/repackage_signing.py
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -10,16 +10,17 @@ from __future__ import absolute_import, 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema
 from taskgraph.util.scriptworker import (
     add_scope_prefix,
     get_signing_cert_scope_per_platform,
     get_worker_type_for_scope,
 )
+from taskgraph.util.taskcluster import get_artifact_path
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not
 # comparable, so we cast all of the keys back to regular strings
 task_description_schema = {str(k): v for k, v in task_description_schema.schema.iteritems()}
 
 transforms = TransformSequence()
@@ -91,38 +92,40 @@ def make_repackage_signing_description(c
             build_platform, is_nightly, config
         )
         scopes = [signing_cert_scope, add_scope_prefix(config, 'signing:format:mar_sha384')]
 
         upstream_artifacts = [{
             "taskId": {"task-reference": "<repackage>"},
             "taskType": "repackage",
             "paths": [
-                "public/build/{}target.complete.mar".format(locale_str),
+                get_artifact_path(dep_job, "{}target.complete.mar".format(locale_str)),
             ],
             "formats": ["mar_sha384"]
         }]
         if 'win' in build_platform:
             upstream_artifacts.append({
                 "taskId": {"task-reference": "<repackage>"},
                 "taskType": "repackage",
                 "paths": [
-                    "public/build/{}target.installer.exe".format(locale_str),
+                    get_artifact_path(dep_job, "{}target.installer.exe".format(locale_str)),
                 ],
                 "formats": ["sha2signcode"]
             })
             scopes.append(add_scope_prefix(config, "signing:format:sha2signcode"))
 
             # Stub installer is only generated on win32
             if '32' in build_platform:
                 upstream_artifacts.append({
                     "taskId": {"task-reference": "<repackage>"},
                     "taskType": "repackage",
                     "paths": [
-                        "public/build/{}target.stub-installer.exe".format(locale_str),
+                        get_artifact_path(
+                            dep_job, "{}target.stub-installer.exe".format(locale_str)
+                        ),
                     ],
                     "formats": ["sha2signcodestub"]
                 })
                 scopes.append(add_scope_prefix(config, "signing:format:sha2signcodestub"))
 
         task = {
             'label': label,
             'description': description,