bug 1442793 - release_generate_checksums_beetmover artifact_prefix r=bhearsum, a=release
authorAki Sasaki <asasaki@mozilla.com>
Wed, 21 Mar 2018 11:14:59 -0700
changeset 463406 c36876c20dc89b8926e43bed3a277af2ff52cf85
parent 463405 6b48863280bfafe1bcdcb3d8ce5727e83cc28314
child 463407 2248aedb33716d4bc148ca5cfd56e621e34e901f
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum, release
bugs1442793
milestone60.0
bug 1442793 - release_generate_checksums_beetmover artifact_prefix r=bhearsum, a=release MozReview-Commit-ID: Fv1nkOEH6V5
taskcluster/taskgraph/transforms/release_generate_checksums_beetmover.py
--- a/taskcluster/taskgraph/transforms/release_generate_checksums_beetmover.py
+++ b/taskcluster/taskgraph/transforms/release_generate_checksums_beetmover.py
@@ -7,16 +7,17 @@ Transform the `release-generate-checksum
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.attributes import copy_attributes_from_dependent_job
 from taskgraph.util.schema import validate_schema, Schema, resolve_keyed_by, optionally_keyed_by
 from taskgraph.util.scriptworker import (get_beetmover_bucket_scope,
                                          get_beetmover_action_scope,
                                          get_phase)
+from taskgraph.util.taskcluster import get_artifact_prefix
 from taskgraph.transforms.beetmover import craft_release_properties
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Required, Optional
 
 transforms = TransformSequence()
 
 CHECKSUMS_BUILD_ARTIFACTS = [
     "SHA256SUMMARY",
@@ -118,21 +119,21 @@ def make_task_description(config, jobs):
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'treeherder': treeherder,
             'shipping-phase': phase,
         }
 
         yield task
 
 
-def generate_upstream_artifacts(signing_task_ref, build_task_ref):
+def generate_upstream_artifacts(job, signing_task_ref, build_task_ref):
     build_mapping = CHECKSUMS_BUILD_ARTIFACTS
     signing_mapping = CHECKSUMS_SIGNING_ARTIFACTS
 
-    artifact_prefix = 'public/build'
+    artifact_prefix = get_artifact_prefix(job)
 
     upstream_artifacts = [{
         "taskId": {"task-reference": build_task_ref},
         "taskType": "build",
         "paths": ["{}/{}".format(artifact_prefix, p)
                   for p in build_mapping],
         "locale": "en-US",
         }, {
@@ -164,15 +165,15 @@ def make_task_worker(config, jobs):
 
         signing_task_ref = "<{}>".format(str(signing_task))
         build_task_ref = "<{}>".format(str(build_task))
 
         worker = {
             'implementation': 'beetmover',
             'release-properties': craft_release_properties(config, job),
             'upstream-artifacts': generate_upstream_artifacts(
-                signing_task_ref, build_task_ref
+                job, signing_task_ref, build_task_ref
             )
         }
 
         job["worker"] = worker
 
         yield job