bug 1453253 - fix esr60 balrog config. p=sfraser r=jlorenzo a=release CLOSED TREE
authorAki Sasaki <asasaki@mozilla.com>
Thu, 26 Apr 2018 20:10:16 +0000
changeset 790941 4f344a27631eb2a12f17693d66240cb13932b71f
parent 790940 d5adb234705a20f612a59d710e7f6f3e09029f1d
child 790942 c937dda2c88350bcbd858828b6abb19361a80bac
push id108656
push userbmo:jlorenzo@mozilla.com
push dateThu, 03 May 2018 08:03:49 +0000
reviewersjlorenzo, release
bugs1453253
milestone60.0
bug 1453253 - fix esr60 balrog config. p=sfraser r=jlorenzo a=release CLOSED TREE
taskcluster/ci/release-balrog-scheduling/kind.yml
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/ci/release-balrog-scheduling/kind.yml
+++ b/taskcluster/ci/release-balrog-scheduling/kind.yml
@@ -13,18 +13,20 @@ transforms:
 kind-dependencies:
    - release-bouncer-check
 
 job-defaults:
    worker-type:
       by-project:
          maple: scriptworker-prov-v1/balrog-dev
          birch: scriptworker-prov-v1/balrog-dev
+         jamun: scriptworker-prov-v1/balrog-dev
          mozilla-beta: scriptworker-prov-v1/balrogworker-v1
          mozilla-release: scriptworker-prov-v1/balrogworker-v1
+         mozilla-esr60: scriptworker-prov-v1/balrogworker-v1
          default: invalid/invalid
    run-on-projects: []
    shipping-phase: ship
    worker:
       implementation: balrog
       balrog-action: schedule
 
 jobs:
@@ -33,18 +35,20 @@ jobs:
       name: release-firefox_schedule_publishing_in_balrog
       shipping-product: firefox
       worker:
          product: firefox
          publish-rules:
             by-project:
                maple: [32]
                birch: [145]
+               jamun: [724]
                mozilla-beta: [32]
                mozilla-release: [145]
+               mozilla-esr60: [806]
                default: []
       treeherder:
          platform: linux64/opt
          symbol: Rel(BSFx)
          tier: 1
          kind: build
    devedition:
       description: Schedule Devedition publishing in balrog
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -16,18 +16,20 @@ transforms:
 
 job-defaults:
    run-on-projects: []  # to make sure this never runs in CI
    shipping-phase: promote
    worker-type:
       by-project:
          maple: scriptworker-prov-v1/balrog-dev
          birch: scriptworker-prov-v1/balrog-dev
+         jamun: scriptworker-prov-v1/balrog-dev
          mozilla-beta: scriptworker-prov-v1/balrogworker-v1
          mozilla-release: scriptworker-prov-v1/balrogworker-v1
+         mozilla-esr60: scriptworker-prov-v1/balrogworker-v1
          default: invalid/invalid
    worker:
       implementation: balrog
       balrog-action: submit-toplevel
       require-mirrors: true
 
 jobs:
    firefox:
@@ -35,42 +37,50 @@ jobs:
       description: Submit toplevel Firefox release to balrog
       shipping-product: firefox
       worker:
          product: firefox
          archive-domain:
             by-project:
                mozilla-beta: archive.mozilla.org
                mozilla-release: archive.mozilla.org
+               mozilla-esr60: archive.mozilla.org
                default: ftp.stage.mozaws.net
          download-domain:
             by-project:
                mozilla-beta: download.mozilla.org
                mozilla-release: download.mozilla.org
+               mozilla-esr60: download.mozilla.org
                default: download.mozilla.org
          channel-names:
             by-project:
                maple: ["beta", "beta-localtest", "beta-cdntest"]
                birch: ["release", "release-localtest", "release-cdntest"]
+               jamun: ["esr", "esr-localtest", "esr-cdntest"]
                mozilla-beta: ["beta", "beta-localtest", "beta-cdntest"]
                mozilla-release: ["release", "release-localtest", "release-cdntest"]
+               mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
                default: []
          publish-rules:
             by-project:
                maple: [32]
                birch: [145]
+               jamun: [724]
                mozilla-beta: [32]
                mozilla-release: [145]
+               mozilla-esr60: [806]
                default: []
          rules-to-update:
             by-project:
                maple: ["firefox-beta-cdntest", "firefox-beta-localtest"]
                birch: ["firefox-release-cdntest", "firefox-release-localtest"]
+               jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
                mozilla-beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
                mozilla-release: ["firefox-release-cdntest", "firefox-release-localtest"]
+               mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
                default: []
          platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
       treeherder:
          platform: linux64/opt
          symbol: Rel(BPFx)
          tier: 1
          kind: build
 
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -40,16 +40,17 @@ This is a list of list-pairs, for orderi
 SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
     'all-nightly-branches', set([
         'mozilla-central',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
+        'mozilla-esr60',
     ])
 ]]
 
 """Map the signing scope aliases to the actual scopes.
 """
 SIGNING_CERT_SCOPES = {
     'all-release-branches': 'signing:cert:release-signing',
     'all-nightly-branches': 'signing:cert:nightly-signing',
@@ -69,21 +70,23 @@ DEVEDITION_SIGNING_CERT_SCOPES = {
 
 """Map beetmover scope aliases to sets of projects.
 """
 BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [[
     'all-nightly-branches', set([
         'mozilla-central',
         'mozilla-beta',
         'mozilla-release',
+        'mozilla-esr60',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
+        'mozilla-esr60',
     ])
 ]]
 
 """The set of all beetmover release target tasks.
 
 Used for both `BEETMOVER_SCOPE_ALIAS_TO_TARGET_TASK` and `get_release_build_number`
 """
 BEETMOVER_CANDIDATES_TARGET_TASKS = set([
@@ -170,29 +173,34 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [[
     'beta', set([
         'mozilla-beta',
     ])
 ], [
     'release', set([
         'mozilla-release',
     ])
 ], [
+    'esr60', set([
+        'mozilla-esr60',
+    ])
+], [
     'esr', set([
         'mozilla-esr52',
     ])
 ]]
 
 """Map the balrog scope aliases to the actual scopes.
 """
 BALROG_SERVER_SCOPES = {
     'nightly': 'balrog:server:nightly',
     'aurora': 'balrog:server:aurora',
     'beta': 'balrog:server:beta',
     'release': 'balrog:server:release',
     'esr': 'balrog:server:esr',
+    'esr60': 'balrog:server:esr',
     'default': 'balrog:server:dep',
 }
 
 
 PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
     'central', set([
         'mozilla-central',
     ])