Bug 1501878 - point partials at unsigned complete mars. r=tomprince
authorAki Sasaki <aki@escapewindow.com>
Tue, 20 Nov 2018 21:26:04 +0000
changeset 504074 209dc0bf2b647b90b1f56b439f82c90df2b3698e
parent 504073 9201152ee77ca64d5cf737fb29e578e348916705
child 504075 d4b468d560b23e6530ce4441120bb2f06bd9161b
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 - point partials at unsigned complete mars. r=tomprince Partial MAR generation doesn't need a signed complete MAR. By pointing the partials tasks at the unsigned complete MARs, we are able to defer signing the complete MARs without deferring partials creation. Differential Revision: https://phabricator.services.mozilla.com/D11729
taskcluster/ci/partials/kind.yml
taskcluster/taskgraph/transforms/partials.py
--- a/taskcluster/ci/partials/kind.yml
+++ b/taskcluster/ci/partials/kind.yml
@@ -5,18 +5,18 @@
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
    - taskgraph.transforms.name_sanity:transforms
    - taskgraph.transforms.partials:transforms
    - taskgraph.transforms.task:transforms
 
 kind-dependencies:
-   - repackage-signing
-   - repackage-signing-l10n
+   - repackage
+   - repackage-l10n
 
 only-for-attributes:
    - nightly
 
 only-for-build-platforms:
    - macosx64-nightly/opt
    - macosx64-devedition-nightly/opt
    - win32-nightly/opt
--- a/taskcluster/taskgraph/transforms/partials.py
+++ b/taskcluster/taskgraph/transforms/partials.py
@@ -53,51 +53,40 @@ def make_task_description(config, jobs):
 
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('kind', 'build')
         treeherder.setdefault('tier', 1)
 
         dependent_kind = str(dep_job.kind)
         dependencies = {dependent_kind: dep_job.label}
-        signing_dependencies = dep_job.dependencies
-        # This is so we get the build task etc in our dependencies to
-        # have better beetmover support.
-        dependencies.update(signing_dependencies)
 
         attributes = copy_attributes_from_dependent_job(dep_job)
         locale = dep_job.attributes.get('locale')
         if locale:
             attributes['locale'] = locale
             treeherder['symbol'] = "p({})".format(locale)
+        attributes['shipping_phase'] = job['shipping-phase']
 
         build_locale = locale or 'en-US'
 
         builds = get_builds(config.params['release_history'], dep_th_platform,
                             build_locale)
 
         # If the list is empty there's no available history for this platform
         # and locale combination, so we can't build any partials.
         if not builds:
             continue
 
-        signing_task = None
-        for dependency in sorted(dependencies.keys()):
-            if 'repackage-signing-l10n' in dependency:
-                signing_task = dependency
-                break
-            if 'repackage-signing' in dependency:
-                signing_task = dependency
-                break
-        signing_task_ref = '<{}>'.format(signing_task)
+        dep_task_ref = '<{}>'.format(dependent_kind)
 
         extra = {'funsize': {'partials': list()}}
         update_number = 1
         artifact_path = "{}{}".format(
-            get_taskcluster_artifact_prefix(dep_job, signing_task_ref, locale=locale),
+            get_taskcluster_artifact_prefix(dep_job, dep_task_ref, locale=locale),
             'target.complete.mar'
         )
         for build in sorted(builds):
             partial_info = {
                 'locale': build_locale,
                 'from_mar': builds[build]['mar_url'],
                 'to_mar': {'task-reference': artifact_path},
                 'platform': get_balrog_platform_name(dep_th_platform),