Bug 1552960 - Follow-up: Remove custom Thunderbird Langpack transform. r=jorgk
authorRob Lemley <rob@thunderbird.net>
Tue, 21 May 2019 22:26:04 +0200
changeset 35656 49774aa1a8efd99e03754f9608273049c93903b3
parent 35655 df9479faea454dbec79b8cde400396a56830d93b
child 35657 cca897225fa9a08959619972fd92ca3e4d859c3f
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
bugs1552960
Bug 1552960 - Follow-up: Remove custom Thunderbird Langpack transform. r=jorgk This will remove duplicated langpack xpi data from the Beetmover artifacts.
taskcluster/ci/beetmover-repackage/kind.yml
taskcluster/comm_taskgraph/__init__.py
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -7,17 +7,16 @@ loader: taskgraph.loader.multi_dep:loade
 group-by: single-locale
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.beetmover_repackage_l10n:transforms
     - taskgraph.transforms.beetmover_repackage:transforms
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
-    - comm_taskgraph:beetmover_add_langpack
 
 kind-dependencies:
     - build
     - build-signing
     - repackage
     - repackage-signing
     - nightly-l10n
     - nightly-l10n-signing
--- a/taskcluster/comm_taskgraph/__init__.py
+++ b/taskcluster/comm_taskgraph/__init__.py
@@ -91,49 +91,16 @@ def remove_widevine_and_stub_installer(c
                                     if not artifact['name'].endswith('/target.stub-installer.exe')]
         if 'env' in payload:
             if 'SIGNED_SETUP_STUB' in payload['env']:
                 del payload['env']['SIGNED_SETUP_STUB']
 
         yield job
 
 
-def beetmover_add_langpack(config, jobs):
-    """
-    Add langpacks to beetmover jobs.
-
-    Firefox signs addons as part of the release process, so has separate tasks
-    for signing and then publishing. Gettin the mozilla-central code to handle
-    uploading unsigned langpacks is complex, so add them afterwards. This code
-    should become unnesssary after the declarative artifact[1] work is complete.
-
-    [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1466714
-    """
-    for job in jobs:
-        task = job['task']
-        payload = task['payload']
-        locale = job['attributes'].get('locale')
-
-        artifact_prefix = "public/build"
-        if locale:
-            artifact_prefix = '{}/{}'.format(artifact_prefix, locale)
-
-        payload['upstreamArtifacts'].append({
-            "locale": locale or 'en-US',
-            "paths": [
-                "{}/target.langpack.xpi".format(artifact_prefix),
-            ],
-            "taskId": {
-                "task-reference": "<build>"
-            },
-            "taskType": "build"
-        })
-        yield job
-
-
 def tests_drop_1proc(config, jobs):
     """
     Remove the -1proc suffix from Treeherder group symbols.
     Restore the -e10s suffix (because some day we will have them!)
 
     Reverses the effects of bug 1541527. Thunderbird builds are all single
     process.
     """