Bug 1501878 - drop complete mar from repackage-signing. r=tomprince
authorAki Sasaki <aki@escapewindow.com>
Tue, 20 Nov 2018 21:26:06 +0000
changeset 504075 d4b468d560b23e6530ce4441120bb2f06bd9161b
parent 504074 209dc0bf2b647b90b1f56b439f82c90df2b3698e
child 504076 15d3e389b233bbebf60e7e45e69672f348db0c3f
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1501878
milestone65.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 1501878 - drop complete mar from repackage-signing. r=tomprince We want to defer mar-signing to the second half of the promote phase, but we want to keep Windows repackaged exe signing in the first half of the promote phase. This means we need to stop signing the complete MAR in repackage-signing, and defer it to another kind. Differential Revision: https://phabricator.services.mozilla.com/D11730
taskcluster/ci/beetmover-repackage/kind.yml
taskcluster/ci/repackage-signing-l10n/kind.yml
taskcluster/ci/repackage-signing/kind.yml
taskcluster/taskgraph/transforms/beetmover_repackage.py
taskcluster/taskgraph/transforms/repackage_signing.py
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -21,18 +21,18 @@ kind-dependencies:
     - nightly-l10n-signing
     - repackage-l10n
     - repackage-signing-l10n
     - partials
     - partials-signing
     - repackage-signing-msi
 
 primary-dependency:
-    - repackage-signing-l10n
-    - repackage-signing
+    - repackage
+    - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
     - linux-devedition-nightly/opt
--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -9,22 +9,15 @@ transforms:
    - taskgraph.transforms.repackage_signing:transforms
    - taskgraph.transforms.repackage_routes:transforms
    - taskgraph.transforms.task:transforms
 
 kind-dependencies:
    - repackage-l10n
 
 only-for-build-platforms:
-   - linux-nightly/opt
-   - linux-devedition-nightly/opt
-   - linux64-nightly/opt
-   - linux64-devedition-nightly/opt
-   - linux64-asan-reporter-nightly/opt
-   - macosx64-nightly/opt
-   - macosx64-devedition-nightly/opt
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
    - win64/opt
    - win64-asan-reporter-nightly/opt
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -9,22 +9,15 @@ transforms:
    - taskgraph.transforms.repackage_signing:transforms
    - taskgraph.transforms.repackage_routes:transforms
    - taskgraph.transforms.task:transforms
 
 kind-dependencies:
    - repackage
 
 only-for-build-platforms:
-   - linux-nightly/opt
-   - linux-devedition-nightly/opt
-   - linux64-nightly/opt
-   - linux64-devedition-nightly/opt
-   - linux64-asan-reporter-nightly/opt
-   - macosx64-nightly/opt
-   - macosx64-devedition-nightly/opt
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
    - win64/opt
    - win64-asan-reporter-nightly/opt
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -124,18 +124,16 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = _compil
 UPSTREAM_ARTIFACT_REPACKAGE_PATHS = [
     'target.dmg',
 ]
 # 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_SIGNED_REPACKAGE_PATHS = [
-    'target.complete.mar',
-    'target.bz2.complete.mar',
     'target.installer.exe',
     'target.stub-installer.exe',
 ]
 
 UPSTREAM_ARTIFACT_SIGNED_MSI_PATHS = [
     'target.installer.msi',
 ]
 
@@ -192,37 +190,37 @@ def make_task_description(config, jobs):
                 locale=attributes.get('locale', 'en-US'),
                 build_platform=attributes.get('build_platform'),
                 build_type=attributes.get('build_type')
             )
         )
 
         upstream_deps = job['dependent-tasks']
 
-        # TODO fix the upstreamArtifact generation to not need this?
         signing_name = "build-signing"
         build_name = "build"
         repackage_name = "repackage"
         repackage_signing_name = "repackage-signing"
         msi_signing_name = "repackage-signing-msi"
         if job.get('locale'):
             signing_name = "nightly-l10n-signing"
             build_name = "nightly-l10n"
             repackage_name = "repackage-l10n"
             repackage_signing_name = "repackage-signing-l10n"
         dependencies = {
             "build": upstream_deps[build_name],
             "repackage": upstream_deps[repackage_name],
-            "repackage-signing": upstream_deps[repackage_signing_name],
             "signing": upstream_deps[signing_name],
         }
         if 'partials-signing' in upstream_deps:
             dependencies['partials-signing'] = upstream_deps['partials-signing']
         if msi_signing_name in upstream_deps:
             dependencies[msi_signing_name] = upstream_deps[msi_signing_name]
+        if repackage_signing_name in upstream_deps:
+            dependencies["repackage-signing"] = upstream_deps[repackage_signing_name]
 
         attributes = copy_attributes_from_dependent_job(dep_job)
         if job.get('locale'):
             attributes['locale'] = job['locale']
 
         bucket_scope = get_beetmover_bucket_scope(config)
         action_scope = get_beetmover_action_scope(config)
 
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -28,18 +28,16 @@ repackage_signing_description_schema = s
     Required('depname', default='repackage'): basestring,
     Optional('label'): basestring,
     Optional('treeherder'): task_description_schema['treeherder'],
     Optional('shipping-product'): task_description_schema['shipping-product'],
     Optional('shipping-phase'): task_description_schema['shipping-phase'],
 })
 
 SIGNING_FORMATS = {
-    'target.complete.mar': ["autograph_hash_only_mar384"],
-    'target.bz2.complete.mar': ["mar"],
     "target.installer.exe": ["sha2signcode"],
     "target.stub-installer.exe": ["sha2signcodestub"],
     "target.installer.msi": ["sha2signcode"],
 }
 
 transforms = TransformSequence()
 transforms.add_validate(repackage_signing_description_schema)