Bug 1538995 - adjust repackage-signing jobs to sign partner stub installers, r=aki
authorNick Thomas <nthomas@mozilla.com>
Thu, 20 Jun 2019 22:18:05 +0000
changeset 543123 8b151e2777fb7d07e06be8e8fe223d9a4fc5c6a6
parent 543122 93f413cf1457adcf6f0a4e28c54fab5f95be7073
child 543124 aea787a5a4c6043c571a020df0a102cd0ee8ae0c
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1538995
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1538995 - adjust repackage-signing jobs to sign partner stub installers, r=aki Differential Revision: https://phabricator.services.mozilla.com/D34948
taskcluster/taskgraph/transforms/repackage_signing_partner.py
--- a/taskcluster/taskgraph/transforms/repackage_signing_partner.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing_partner.py
@@ -5,17 +5,17 @@
 Transform the repackage signing task into an actual task description.
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.loader.single_dep import schema
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job
-from taskgraph.util.partners import check_if_partners_enabled
+from taskgraph.util.partners import check_if_partners_enabled, get_partner_config_by_kind
 from taskgraph.util.scriptworker import (
     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
 
@@ -77,16 +77,31 @@ def make_repackage_signing_description(c
             upstream_artifacts = [{
                 "taskId": {"task-reference": "<repackage>"},
                 "taskType": "repackage",
                 "paths": [
                     get_artifact_path(dep_job, "{}/target.installer.exe".format(repack_id)),
                 ],
                 "formats": ["sha2signcode", "autograph_gpg"]
             }]
+
+            partner_config = get_partner_config_by_kind(config, config.kind)
+            partner, subpartner, _ = repack_id.split('/')
+            repack_stub_installer = partner_config[partner][subpartner].get(
+                'repack_stub_installer')
+            if build_platform.startswith('win32') and repack_stub_installer:
+                upstream_artifacts.append({
+                    "taskId": {"task-reference": "<repackage>"},
+                    "taskType": "repackage",
+                    "paths": [
+                        get_artifact_path(dep_job, "{}/target.stub-installer.exe".format(
+                            repack_id)),
+                    ],
+                    "formats": ["sha2signcode", "autograph_gpg"]
+                })
         elif 'mac' in build_platform:
             upstream_artifacts = [{
                 "taskId": {"task-reference": "<repackage>"},
                 "taskType": "repackage",
                 "paths": [
                     get_artifact_path(dep_job, "{}/target.dmg".format(repack_id)),
                 ],
                 "formats": ["autograph_gpg"]