From 32d21744f22f9f159ee8632cc18fa2528177338f Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Tue, 1 Aug 2017 12:29:37 -0400
Subject: [PATCH] Bug 1386332 - Clarify repackage tasks. r=dustin

MozReview-Commit-ID: LwWRhqZ7cZb

--HG--
extra : rebase_source : 6cb0d61a85c1b3a41d3c2701bea4ee51fa562aa5
---
 taskcluster/ci/repackage-l10n/kind.yml             |  1 +
 taskcluster/ci/repackage/kind.yml                  |  1 +
 taskcluster/taskgraph/transforms/repackage.py      | 12 ++++++++++--
 taskcluster/taskgraph/transforms/repackage_l10n.py |  5 -----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/taskcluster/ci/repackage-l10n/kind.yml b/taskcluster/ci/repackage-l10n/kind.yml
index d6ab9bf97861..fb0761100fbf 100644
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -6,6 +6,7 @@ loader: taskgraph.loader.single_dep:loader
 
 transforms:
    - taskgraph.transforms.repackage_l10n:transforms
+   - taskgraph.transforms.name_sanity:transforms
    - taskgraph.transforms.repackage:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml
index 00a07faa00ec..e78ef853b4f0 100644
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -5,6 +5,7 @@
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
+   - taskgraph.transforms.name_sanity:transforms
    - taskgraph.transforms.repackage:transforms
    - taskgraph.transforms.repackage_routes:transforms
    - taskgraph.transforms.job:transforms
diff --git a/taskcluster/taskgraph/transforms/repackage.py b/taskcluster/taskgraph/transforms/repackage.py
index 0d1069387e4a..81e894817d6a 100644
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -157,10 +157,18 @@ def make_job_description(config, jobs):
             cot = job.setdefault('extra', {}).setdefault('chainOfTrust', {})
             cot.setdefault('inputs', {})['docker-image'] = {"task-reference": "<docker-image>"}
 
+        description = (
+            "Repackaging for locale '{locale}' for build '"
+            "{build_platform}/{build_type}'".format(
+                locale=attributes.get('locale', 'en-US'),
+                build_platform=attributes.get('build_platform'),
+                build_type=attributes.get('build_type')
+            )
+        )
+
         task = {
             'label': job['label'],
-            'description': "{} Repackage".format(
-                dep_job.task["metadata"]["description"]),
+            'description': description,
             'worker-type': worker_type,
             'dependencies': dependencies,
             'attributes': attributes,
diff --git a/taskcluster/taskgraph/transforms/repackage_l10n.py b/taskcluster/taskgraph/transforms/repackage_l10n.py
index a611c3ffe9e0..19cafa3a424f 100644
--- a/taskcluster/taskgraph/transforms/repackage_l10n.py
+++ b/taskcluster/taskgraph/transforms/repackage_l10n.py
@@ -17,17 +17,12 @@ def split_locales(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         for locale in dep_job.attributes.get('chunk_locales', []):
-            label = dep_job.label.replace("signing-", "repackage-{}-".format(locale))
-            label = "repackage-{}-{}/{}".format(locale,
-                                                dep_job.attributes['build_platform'],
-                                                dep_job.attributes['build_type'],)
 
             treeherder = job.get('treeherder', {})
             treeherder['symbol'] = 'tc-L10n-Rpk({})'.format(locale)
 
             yield {
                 'locale': locale,
-                'label': label,
                 'treeherder': treeherder,
                 'dependent-task': dep_job,
             }