Bug 1430936 - Remove docker-image dependency from beetmover-repackage and repackage-signing tasks. r=aki
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 17 Jan 2018 08:39:58 +0900
changeset 454333 973377f16727ad3967dfaf61d06614659df3118f
parent 454332 c33869ac6bc8625079de45edfa37d66677c42ed0
child 454334 558cb0501f8e6c2362c408342ca278cd5057e942
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1430936
milestone59.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 1430936 - Remove docker-image dependency from beetmover-repackage and repackage-signing tasks. r=aki
taskcluster/taskgraph/transforms/beetmover_repackage.py
taskcluster/taskgraph/transforms/repackage_signing.py
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -190,25 +190,16 @@ def make_task_description(config, jobs):
                 build_platform=attributes.get('build_platform'),
                 build_type=attributes.get('build_type')
             )
         )
 
         dependent_kind = str(dep_job.kind)
         dependencies = {dependent_kind: dep_job.label}
 
-        if 'docker-image' in dep_job.dependencies:
-            # macosx nightly builds depend on repackage which use in tree
-            # docker images and thus have two dependencies
-            # change the signing_dependencies to be use the ones in
-            docker_dependencies = {"docker-image":
-                                   dep_job.dependencies['docker-image']
-                                   }
-            dependencies.update(docker_dependencies)
-
         signing_name = "build-signing"
         if job.get('locale'):
             signing_name = "nightly-l10n-signing"
         signing_dependencies = {signing_name:
                                 dep_job.dependencies[signing_name]
                                 }
         dependencies.update(signing_dependencies)
 
@@ -337,21 +328,19 @@ least 2 regular expressions. First match
         ))
 
 
 def is_valid_beetmover_job(job):
     # beetmover after partials-signing should have six dependencies.
     # windows builds w/o partials don't have docker-image, so fewer
     # dependencies
     if 'partials-signing' in job['dependencies'].keys():
-        expected_dep_count = 6
-    elif any(b in job['attributes']['build_platform'] for b in _WINDOWS_BUILD_PLATFORMS):
+        expected_dep_count = 5
+    else:
         expected_dep_count = 4
-    else:
-        expected_dep_count = 5
 
     return (len(job["dependencies"]) == expected_dep_count and
             any(['repackage' in j for j in job['dependencies']]))
 
 
 @transforms.add
 def make_task_worker(config, jobs):
     for job in jobs:
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -68,17 +68,18 @@ def make_repackage_signing_description(c
             )
         )
 
         dependencies = {"repackage": 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)
+        dependencies.update({k: v for k, v in signing_dependencies.items()
+                             if k != 'docker-image'})
         attributes = copy_attributes_from_dependent_job(dep_job)
         attributes['repackage_type'] = 'repackage-signing'
 
         locale_str = ""
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'rs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
             locale_str = "{}/".format(dep_job.attributes.get('locale'))