Bug 1501776: [taskgraph] Remove extra dependency logic from beetmover checksum; r=tomprince
authorAki Sasaki <asasaki@mozilla.com>
Wed, 24 Oct 2018 22:38:00 +0000
changeset 499308 226a941a7069093cd5770168ee123fa5630c41c1
parent 499307 2ab590b3ed3f6534c07bae569ec3c84311b1e82b
child 499309 99bb541e5ce1e45f80f914b99077752bd99d77b5
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
bugs1501776
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 1501776: [taskgraph] Remove extra dependency logic from beetmover checksum; r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D9719
taskcluster/taskgraph/transforms/beetmover_checksums.py
--- a/taskcluster/taskgraph/transforms/beetmover_checksums.py
+++ b/taskcluster/taskgraph/transforms/beetmover_checksums.py
@@ -83,19 +83,16 @@ def make_beetmover_checksums_description
             extra['product'] = 'fennec'
         elif 'devedition' in build_platform:
             extra['product'] = 'devedition'
         else:
             extra['product'] = 'firefox'
 
         dependent_kind = str(dep_job.kind)
         dependencies = {dependent_kind: dep_job.label}
-        for k, v in dep_job.dependencies.items():
-            if k.startswith('beetmover'):
-                dependencies[k] = v
 
         attributes = copy_attributes_from_dependent_job(dep_job)
 
         if dep_job.attributes.get('locale'):
             treeherder['symbol'] = 'BMcs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
 
         bucket_scope = get_beetmover_bucket_scope(config)
@@ -140,35 +137,22 @@ def generate_upstream_artifacts(refs, pl
     }]
 
     return upstream_artifacts
 
 
 @transforms.add
 def make_beetmover_checksums_worker(config, jobs):
     for job in jobs:
-        valid_beetmover_job = (len(job["dependencies"]) == 2)
-        if not valid_beetmover_job:
-            raise NotImplementedError("Beetmover checksums must have two dependencies.")
-
         locale = job["attributes"].get("locale")
         platform = job["attributes"]["build_platform"]
 
         refs = {
-            "beetmover": None,
-            "signing": None,
+            "signing": "<checksums-signing>",
         }
-        for dependency in job["dependencies"].keys():
-            if dependency.startswith("beetmover"):
-                refs['beetmover'] = "<{}>".format(dependency)
-            else:
-                refs['signing'] = "<{}>".format(dependency)
-        if None in refs.values():
-            raise NotImplementedError(
-                "Beetmover checksums must have a beetmover and signing dependency!")
 
         worker = {
             'implementation': 'beetmover',
             'release-properties': craft_release_properties(config, job),
             'upstream-artifacts': generate_upstream_artifacts(
                 refs, platform, locale
             ),
         }