Bug 1376550 - Stop signing the complete.mar (generated from the unsigned build) on OSX r=dustin

Support OSX Signed nightlies (in the complete.mar too)

MozReview-Commit-ID: 9J3mLrb3fTJ

--HG--
extra : rebase_source : 1f2ca9b97c1ee68b09d34cc60e32a7dd19cd27c5

taskcluster/taskgraph/transforms/beetmover_repackage.py

@@ -47,24 +47,10 @@ _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US = [
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
-_DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US = [
-    "update/target.complete.mar",
-]
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
 _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N = [
     "target.langpack.xpi",
     "balrog_props.json",
 ]
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
-_DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N = [
-    "target.complete.mar",
-]
 
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
@@ -78,14 +64,6 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
-UPSTREAM_ARTIFACT_SIGNED_PATHS = {
-    'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US,
-    'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N,
-}
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
 UPSTREAM_ARTIFACT_REPACKAGE_PATHS = {
     'macosx64-nightly': ["target.dmg"],
     'macosx64-nightly-l10n': ["target.dmg"],
@@ -198,11 +176,9 @@ def make_task_description(config, jobs):
         yield task
 
 
-def generate_upstream_artifacts(signing_task_ref, build_task_ref,
-                                repackage_task_ref, platform,
-                                locale=None):
+def generate_upstream_artifacts(build_task_ref, repackage_task_ref,
+                                platform, locale=None):
 
-    signing_mapping = UPSTREAM_ARTIFACT_SIGNED_PATHS
     build_mapping = UPSTREAM_ARTIFACT_UNSIGNED_PATHS
     repackage_mapping = UPSTREAM_ARTIFACT_REPACKAGE_PATHS
 
@@ -218,12 +194,6 @@ def generate_upstream_artifacts(signing_task_ref, build_task_ref,
                   for p in build_mapping[platform]],
         "locale": locale or "en-US",
         }, {
-        "taskId": {"task-reference": signing_task_ref},
-        "taskType": "signing",
-        "paths": ["{}/{}".format(artifact_prefix, p)
-                  for p in signing_mapping[platform]],
-        "locale": locale or "en-US",
-        }, {
         "taskId": {"task-reference": repackage_task_ref},
         "taskType": "repackage",
         "paths": ["{}/{}".format(artifact_prefix, p)
@@ -246,20 +216,18 @@ def make_task_worker(config, jobs):
         platform = job["attributes"]["build_platform"]
         build_task = None
         repackage_task = None
-        signing_task = None
         for dependency in job["dependencies"].keys():
             if 'repackage' in dependency:
                 repackage_task = dependency
             elif 'signing' in dependency:
-                signing_task = dependency
+                pass
             else:
                 build_task = "build"
 
-        signing_task_ref = "<" + str(signing_task) + ">"
         build_task_ref = "<" + str(build_task) + ">"
         repackage_task_ref = "<" + str(repackage_task) + ">"
         upstream_artifacts = generate_upstream_artifacts(
-            signing_task_ref, build_task_ref, repackage_task_ref, platform, locale
+            build_task_ref, repackage_task_ref, platform, locale
         )
 
         worker = {'implementation': 'beetmover',

taskcluster/taskgraph/transforms/build_signing.py

@@ -49,9 +49,6 @@ def make_signing_description(config, jobs):
                 {
                    'artifacts': ['public/build/target.dmg'],
                    'format': 'macapp',
-                }, {
-                   'artifacts': ['public/build/update/target.complete.mar'],
-                   'format': 'mar',
                 },
             ]
         else: