Bug 1459050 - ja-JP-mac language pack should be submitted to AMO as "unlisted" in all cases. r=aki a=release
authorJustin Wood <Callek@gmail.com>
Thu, 03 May 2018 14:26:55 -0400
changeset 795864 5c4f8510ccf7e32740818dcfb5f87ad1f931d5ae
parent 795863 42c4c1bc1fa68bf89b6ff9849847063d38bec2c8
child 795865 4a43592f14df511247ffcfde4a850003f274f272
push id110108
push userbmo:tom@mozilla.com
push dateWed, 16 May 2018 18:43:56 +0000
reviewersaki, release
bugs1459050
milestone60.0.1
Bug 1459050 - ja-JP-mac language pack should be submitted to AMO as "unlisted" in all cases. r=aki a=release Differential Revision: https://phabricator.services.mozilla.com/D1129
taskcluster/ci/release-sign-and-push-langpacks/kind.yml
taskcluster/taskgraph/transforms/release_sign_and_push_langpacks.py
--- a/taskcluster/ci/release-sign-and-push-langpacks/kind.yml
+++ b/taskcluster/ci/release-sign-and-push-langpacks/kind.yml
@@ -27,17 +27,20 @@ job-template:
          mozilla-release: scriptworker-prov-v1/addon-v1
          mozilla-esr60: scriptworker-prov-v1/addon-v1
          default: scriptworker-prov-v1/addon-dev
    worker:
       implementation: sign-and-push-addons
       channel:
          by-project:
             # Only release langpacks are listed publicly
-            mozilla-release: listed
+            mozilla-release:
+               by-platform:
+                  macosx64.*: unlisted  # ja-JP-mac is only langpack on mac, and is unlisted always
+                  default: listed
             default: unlisted
       upstream-artifacts:   # See transforms
    run-on-projects: []
    scopes:
       by-project:
          mozilla-beta:
             - project:releng:addons.mozilla.org:server:production
          mozilla-release:
--- a/taskcluster/taskgraph/transforms/release_sign_and_push_langpacks.py
+++ b/taskcluster/taskgraph/transforms/release_sign_and_push_langpacks.py
@@ -24,17 +24,19 @@ transforms = TransformSequence()
 
 langpack_sign_push_description_schema = Schema({
     Required('dependent-task'): object,
     Required('label'): basestring,
     Required('description'): basestring,
     Required('worker-type'): optionally_keyed_by('project', basestring),
     Required('worker'): {
         Required('implementation'): 'sign-and-push-addons',
-        Required('channel'): optionally_keyed_by('project', Any('listed', 'unlisted')),
+        Required('channel'): optionally_keyed_by(
+            'project',
+            optionally_keyed_by('platform', Any('listed', 'unlisted'))),
         Required('upstream-artifacts'): None,   # Processed here below
     },
 
     Required('run-on-projects'): [],
     Required('scopes'): optionally_keyed_by('project', [basestring]),
     Required('shipping-phase'): task_description_schema['shipping-phase'],
     Required('shipping-product'): task_description_schema['shipping-product'],
 })
@@ -64,17 +66,19 @@ def resolve_keys(config, jobs):
     for job in jobs:
         resolve_keyed_by(
             job, 'worker-type', item_name=job['label'], project=config.params['project']
         )
         resolve_keyed_by(
             job, 'scopes', item_name=job['label'], project=config.params['project']
         )
         resolve_keyed_by(
-            job, 'worker.channel', item_name=job['label'], project=config.params['project']
+            job, 'worker.channel', item_name=job['label'],
+            project=config.params['project'],
+            platform=job['dependent-task'].attributes['build_platform'],
         )
 
         yield job
 
 
 @transforms.add
 def copy_attributes(config, jobs):
     for job in jobs: