Bug 1559327 - Adapt to signing change; rs=bustage-fix DONTBUILD
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 14 Jun 2019 21:06:16 +1200
changeset 35865 3f21675fcb0b3f2898e34b9b35279a3b8e336f7f
parent 35864 acbf665ac19174b273e9cf4c76a14b6c1e341be8
child 35866 99b37b22c1f12f3dc8fb355c0c89c0cbf8402342
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersbustage-fix
bugs1559327
Bug 1559327 - Adapt to signing change; rs=bustage-fix DONTBUILD
taskcluster/comm_taskgraph/__init__.py
--- a/taskcluster/comm_taskgraph/__init__.py
+++ b/taskcluster/comm_taskgraph/__init__.py
@@ -68,24 +68,24 @@ def remove_widevine_and_stub_installer(c
     declarative artifact[1] work is complete.
 
     [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1466714
     """
     for job in jobs:
         task = job['task']
         payload = task['payload']
 
-        for scope in ['project:comm:thunderbird:releng:signing:format:widevine',
+        for scope in ['project:comm:thunderbird:releng:signing:format:autograph_widevine',
                       'project:comm:thunderbird:releng:signing:format:sha2signcodestub']:
             if scope in task['scopes']:
                 task['scopes'].remove(scope)
         if 'upstreamArtifacts' in payload:
             for artifact in payload['upstreamArtifacts']:
-                if 'widevine' in artifact.get('formats', []):
-                    artifact['formats'].remove('widevine')
+                if 'autograph_widevine' in artifact.get('formats', []):
+                    artifact['formats'].remove('autograph_widevine')
                 artifact['paths'] = [path for path in artifact['paths']
                                      if not path.endswith(('/setup-stub.exe',
                                                            '/target.stub-installer.exe',))]
             payload['upstreamArtifacts'] = [artifact for artifact in payload['upstreamArtifacts']
                                             if artifact.get('formats', []) != ['sha2signcodestub']]
         if 'artifacts' in payload and isinstance(payload['artifacts'], list):
             payload['artifacts'] = [artifact for artifact in payload['artifacts']
                                     if not artifact['name'].endswith('/target.stub-installer.exe')]