Merge mozilla-release to esr60. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 07 May 2018 10:20:53 -0400
changeset 795867 eca6dd107bf79270da8093873ea90313f198a55c
parent 795866 6b2b6c319ef92c58d0bece02af59cf1553eab609 (current diff)
parent 795865 4a43592f14df511247ffcfde4a850003f274f272 (diff)
child 795868 d8bfa9b99692a46f2875901c63ae5c2796f0f80f
push id110108
push userbmo:tom@mozilla.com
push dateWed, 16 May 2018 18:43:56 +0000
reviewersmerge
milestone60.0.1
Merge mozilla-release to esr60. a=merge
browser/config/version_display.txt
taskcluster/ci/release-balrog-scheduling/kind.yml
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-bouncer-aliases/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/ci/release-generate-checksums/kind.yml
taskcluster/ci/release-secondary-update-verify-config/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
--- a/.hgtags
+++ b/.hgtags
@@ -1035,8 +1035,10 @@ f2ac3383fb97a55d11a876f17189613a852a0077
 f2ac3383fb97a55d11a876f17189613a852a0077 FENNEC_60_0b15_RELEASE
 42d311bd68789edd7fea323f6e2bc5bbbfd86760 FIREFOX_RELEASE_60_BASE
 6c1e7178ca23655d400b4895858354fb2b9fb509 FIREFOX_RELEASE_59_END
 96503bab218f493499d9355f30450553517e3ab4 FIREFOX_ESR_60_BASE
 96503bab218f493499d9355f30450553517e3ab4 FIREFOX_ESR_60_BASE
 3ce05c13f187c5627795195a08f0d605d03d8add FIREFOX_ESR_60_BASE
 6b51784853e47e091d213d421a19cb623af718f0 FIREFOX_59_0_3_BUILD1
 6b51784853e47e091d213d421a19cb623af718f0 FIREFOX_59_0_3_RELEASE
+fb499da47550f9abfa20a93c3830fbf971962e99 FENNEC_60_0_BUILD1
+fb499da47550f9abfa20a93c3830fbf971962e99 FENNEC_60_0_RELEASE
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-60.0
+60.0.1
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-60.0
+60.0.1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by build/moz.configure/init.configure.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-60.0
+60.0.1
--- a/taskcluster/ci/release-secondary-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify-config/kind.yml
@@ -20,17 +20,17 @@ job-defaults:
          in-tree: "update-verify"
       max-run-time: 3600
       artifacts:
          - name: public/build/update-verify.cfg
            path: /builds/worker/checkouts/gecko/update-verify.cfg
            type: file
    run:
       using: run-task
-      sparse-profile: update-verify
+      sparse-profile: mozharness
    extra:
       app-name: browser
       product: firefox
       archive-prefix:
          by-project:
             birch: "http://ftp.stage.mozaws.net/pub"
             default: "https://archive.mozilla.org/pub"
       previous-archive-prefix:
--- 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: