Bug 1551738: [release] Add esr68 release-type, and corresponding branch and scriprworker configuration; r=Callek
authorTom Prince <mozilla@hocat.ca>
Wed, 15 May 2019 18:11:28 +0000
changeset 535883 f3fdb2fd9fa126bcfeb564bfe550ef781cc81756
parent 535882 d1fa8dc33e401083572bb818559ac2bc4d29338b
child 535884 9dd4eba320e64aea32ba5e62b96c14c93768427f
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1551738
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1551738: [release] Add esr68 release-type, and corresponding branch and scriprworker configuration; r=Callek Differential Revision: https://phabricator.services.mozilla.com/D31188
taskcluster/docs/parameters.rst
taskcluster/taskgraph/decision.py
taskcluster/taskgraph/util/attributes.py
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/docs/parameters.rst
+++ b/taskcluster/docs/parameters.rst
@@ -151,17 +151,17 @@ Release Promotion
 
 ``app_version``
    Specify the application version for release tasks. For releases, this is often a less specific version number than ``version``.
 
 ``next_version``
    Specify the next version for version bump tasks.
 
 ``release_type``
-   The type of release being promoted. One of "nightly", "beta", "esr60", "release-rc", or "release".
+   The type of release being promoted. One of "nightly", "beta", "esr60", "esr68", "release-rc", or "release".
 
 ``release_eta``
    The time and date when a release is scheduled to live. This value is passed to Balrog.
 
 ``release_enable_partners``
    Boolean which controls repacking vanilla Firefox builds for partners.
 
 ``release_partners``
--- a/taskcluster/taskgraph/decision.py
+++ b/taskcluster/taskgraph/decision.py
@@ -77,31 +77,41 @@ PER_PROJECT_PARAMETERS = {
         'release_type': 'release',
     },
 
     'mozilla-esr60': {
         'target_tasks_method': 'mozilla_esr60_tasks',
         'release_type': 'esr60',
     },
 
+    'mozilla-esr68': {
+        'target_tasks_method': 'mozilla_esr68_tasks',
+        'release_type': 'esr68',
+    },
+
     'comm-central': {
         'target_tasks_method': 'default',
         'release_type': 'nightly',
     },
 
     'comm-beta': {
         'target_tasks_method': 'mozilla_beta_tasks',
         'release_type': 'beta',
     },
 
     'comm-esr60': {
         'target_tasks_method': 'mozilla_esr60_tasks',
         'release_type': 'release',
     },
 
+    'comm-esr68': {
+        'target_tasks_method': 'mozilla_esr68_tasks',
+        'release_type': 'release',
+    },
+
     'pine': {
         'target_tasks_method': 'pine_tasks',
     },
 
     # the default parameters are used for projects that do not match above.
     'default': {
         'target_tasks_method': 'default',
     }
--- a/taskcluster/taskgraph/util/attributes.py
+++ b/taskcluster/taskgraph/util/attributes.py
@@ -14,19 +14,21 @@ INTEGRATION_PROJECTS = {
 
 TRUNK_PROJECTS = INTEGRATION_PROJECTS | {'mozilla-central', 'comm-central'}
 
 RELEASE_PROJECTS = {
     'mozilla-central',
     'mozilla-beta',
     'mozilla-release',
     'mozilla-esr60',
+    'mozilla-esr68',
     'comm-central',
     'comm-beta',
     'comm-esr60',
+    'comm-esr68',
     'oak',
 }
 
 RELEASE_PROMOTION_PROJECTS = {
     'jamun',
     'maple',
     'try',
     'try-comm-central',
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -53,16 +53,17 @@ SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
         'comm-central',
         'oak',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
         'mozilla-esr60',
+        'mozilla-esr68',
         'comm-beta',
         'comm-esr60',
     ])
 ]]
 
 """Map the signing scope aliases to the actual scopes.
 """
 SIGNING_CERT_SCOPES = {
@@ -90,18 +91,20 @@ BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [[
         'comm-central',
         'oak',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
         'mozilla-esr60',
+        'mozilla-esr68',
         'comm-beta',
         'comm-esr60',
+        'comm-esr68',
     ])
 ]]
 
 """Map the beetmover scope aliases to the actual scopes.
 """
 BEETMOVER_BUCKET_SCOPES = {
     'all-release-branches': 'beetmover:bucket:release',
     'all-nightly-branches': 'beetmover:bucket:nightly',
@@ -140,30 +143,31 @@ BALROG_SCOPE_ALIAS_TO_PROJECT = [[
         'mozilla-release',
     ])
 ], [
     'esr60', set([
         'mozilla-esr60',
         'comm-esr60',
     ])
 ], [
-    'esr', set([
-        'mozilla-esr52',
+    'esr68', set([
+        'mozilla-esr68',
+        'comm-esr68',
     ])
 ]]
 
 """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',
+    'esr68': 'balrog:server:esr',
     'default': 'balrog:server:dep',
 }
 
 
 PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
     'central', set([
         'mozilla-central',
     ])