Backed out changeset 292d5c030eff (bug 1689232) on suspicion of cause macOS startup crashes (bug 1689807) a=backout

taskcluster/taskgraph/transforms/openh264_signing.py

@@ -56,32 +56,24 @@ def make_signing_description(config, jobs):
         )
 
         scopes = [signing_cert_scope]
-        worker_type = "linux-signing"
-        worker = {
-            "implementation": "scriptworker-signing",
-            "max-run-time": 3600,
-        }
-        rev = attributes["openh264_rev"]
-        upstream_artifact = {
-            "taskId": {"task-reference": "<openh264>"},
-            "taskType": "build",
-        }
 
         if "win" in build_platform:
             # job['primary-dependency'].task['payload']['command']
-            upstream_artifact["formats"] = ["autograph_authenticode"]
-        elif "mac" in build_platform:
-            upstream_artifact["formats"] = ["mac_single_file"]
-            upstream_artifact["singleFileGlobs"] = ["libgmpopenh264.dylib"]
-            worker_type = "mac-signing"
-            worker["mac-behavior"] = "mac_single_file"
+            formats = ["autograph_authenticode"]
         else:
-            upstream_artifact["formats"] = ["autograph_gpg"]
+            formats = ["autograph_gpg"]
 
-        upstream_artifact["paths"] = [
-            "private/openh264/openh264-{}-{}.zip".format(build_platform, rev),
+        rev = attributes["openh264_rev"]
+        upstream_artifacts = [
+            {
+                "taskId": {"task-reference": "<openh264>"},
+                "taskType": "build",
+                "paths": [
+                    "private/openh264/openh264-{}-{}.zip".format(build_platform, rev),
+                ],
+                "formats": formats,
+            }
         ]
-        worker["upstream-artifacts"] = [upstream_artifact]
 
         treeherder = inherit_treeherder_from_dep(job, dep_job)
         treeherder.setdefault(
@@ -94,8 +86,12 @@ def make_signing_description(config, jobs):
         task = {
             "label": job["label"],
             "description": description,
-            "worker-type": worker_type,
-            "worker": worker,
+            "worker-type": "linux-signing",
+            "worker": {
+                "implementation": "scriptworker-signing",
+                "upstream-artifacts": upstream_artifacts,
+                "max-run-time": 3600,
+            },
             "scopes": scopes,
             "dependencies": dependencies,
             "attributes": my_attributes,

taskcluster/taskgraph/transforms/task.py

@@ -829,7 +829,6 @@ def build_generic_worker_payload(config, task, task_def):
                 Required("paths"): [text_type],
                 # Signing formats to use on each of the paths
                 Required("formats"): [text_type],
-                Optional("singleFileGlobs"): [text_type],
             }
         ],
         # behavior for mac iscript
@@ -838,7 +837,6 @@ def build_generic_worker_payload(config, task, task_def):
             "mac_notarize_part_3",
             "mac_sign_and_pkg",
             "mac_geckodriver",
-            "mac_single_file",
         ),
         Optional("entitlements-url"): text_type,
     },