Bug 1551738: [release] Match on `esr.*` instead of `esr60` in a bunch of generic places; r=Callek
authorTom Prince <mozilla@hocat.ca>
Wed, 15 May 2019 18:09:22 +0000
changeset 532814 d73df296b5535e5a048e74d4122c2816fc7ba6d1
parent 532813 efb47df74a705992417942aa52bc60709090c514
child 532815 d1fa8dc33e401083572bb818559ac2bc4d29338b
push id11272
push userapavel@mozilla.com
push dateThu, 16 May 2019 15:28:22 +0000
treeherdermozilla-beta@2265bfc5920d [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] Match on `esr.*` instead of `esr60` in a bunch of generic places; r=Callek These are all places where the configuration is unlikely to change between major ESR versions, or in many of them, between beta, release and esr. Differential Revision: https://phabricator.services.mozilla.com/D31186
taskcluster/ci/config.yml
taskcluster/ci/release-early-tagging/kind.yml
taskcluster/ci/release-notify-promote/kind.yml
taskcluster/ci/release-notify-push/kind.yml
taskcluster/ci/release-notify-ship/kind.yml
taskcluster/ci/release-notify-started/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-version-bump/kind.yml
taskcluster/ci/repo-update/kind.yml
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -259,17 +259,17 @@ partner-urls:
                         by-release-level:
                             production: 'git@github.com:mozilla-partners/mozilla-EME-free-manifest.git'
                             staging: 'git@github.com:moz-releng-automation-stage/mozilla-EME-free-manifest.git'
 
 
 task-priority:
     by-project:
         'mozilla-release': 'highest'
-        'mozilla-esr60': 'very-high'
+        'mozilla-esr.*': 'very-high'
         'mozilla-beta': 'high'
         'mozilla-central': 'medium'
         'autoland': 'low'
         'mozilla-inbound': 'low'
         'default': 'very-low'
 
 workers:
     aliases:
--- a/taskcluster/ci/release-early-tagging/kind.yml
+++ b/taskcluster/ci/release-early-tagging/kind.yml
@@ -22,20 +22,17 @@ job-defaults:
             default: scriptworker-prov-v1/treescript-dev
     worker:
         implementation: treescript
         tags: ['buildN']
         bump: false
         dontbuild: true
         push:
             by-project:
-                mozilla-beta: true
-                mozilla-release: true
-                mozilla-esr52: true
-                mozilla-esr60: true
+                mozilla-(beta|release|esr.*): true
                 maple: true
                 birch: true
                 default: false
 
 jobs:
     fennec:
         name: fennec-tag-buildN
         shipping-product: fennec
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@@ -29,19 +29,17 @@ job-defaults:
             - /bin/bash
             - -c
             - echo "Dummy task"
     notifications:
         subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} is in the candidates directory"
         message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} is in the candidates directory"
         emails:
             by-project:
-                mozilla-beta: ["release-signoff@mozilla.org"]
-                mozilla-release: ["release-signoff@mozilla.org"]
-                mozilla-esr60: ["release-signoff@mozilla.org"]
+                mozilla-(beta|release|esr.*): ["release-signoff@mozilla.org"]
                 try: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     fennec:
         shipping-product: fennec
     firefox:
         shipping-product: firefox
--- a/taskcluster/ci/release-notify-push/kind.yml
+++ b/taskcluster/ci/release-notify-push/kind.yml
@@ -27,19 +27,17 @@ job-defaults:
             - /bin/bash
             - -c
             - echo "Dummy task"
     notifications:
         subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest"
         message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest"
         emails:
             by-project:
-                mozilla-beta: ["release-signoff@mozilla.org"]
-                mozilla-release: ["release-signoff@mozilla.org"]
-                mozilla-esr60: ["release-signoff@mozilla.org"]
+                mozilla-(beta|release|esr.*): ["release-signoff@mozilla.org"]
                 try: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     firefox:
         shipping-product: firefox
     devedition:
         shipping-product: devedition
--- a/taskcluster/ci/release-notify-ship/kind.yml
+++ b/taskcluster/ci/release-notify-ship/kind.yml
@@ -29,19 +29,17 @@ job-defaults:
         max-run-time: 600
         command:
             - /bin/bash
             - -c
             - echo "Dummy task"
     notifications:
         emails:
             by-project:
-                mozilla-beta: ["release-signoff@mozilla.org"]
-                mozilla-release: ["release-signoff@mozilla.org"]
-                mozilla-esr60: ["release-signoff@mozilla.org"]
+                mozilla-(beta|release|esr.*): ["release-signoff@mozilla.org"]
                 try: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     fennec:
         shipping-product: fennec
         notifications:
             subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has shipped!"
--- a/taskcluster/ci/release-notify-started/kind.yml
+++ b/taskcluster/ci/release-notify-started/kind.yml
@@ -16,19 +16,17 @@ job-defaults:
     run-on-projects: []
     shipping-phase: promote
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian9-base"}
         max-run-time: 600
     emails:
         by-project:
-            mozilla-beta: ["release-signoff@mozilla.org"]
-            mozilla-release: ["release-signoff@mozilla.org"]
-            mozilla-esr60: ["release-signoff@mozilla.org"]
+            mozilla-(beta|release|esr.*): ["release-signoff@mozilla.org"]
             try: ["{config[params][owner]}"]
             default: []
 
 jobs:
     fennec:
         shipping-product: fennec
     firefox:
         shipping-product: firefox
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -47,17 +47,17 @@ job-defaults:
         # because of the special case added by
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1419189
         # The devedition override can be removed after 58.0b1
         # is behind a watershed
         include-version:
             by-release-type:
                 beta: beta
                 release(-rc)?: nonbeta
-                esr60: esr
+                esr.*: esr
                 default: beta
         last-watershed:
             by-release-type:
                 beta:
                     by-platform:
                         win64-aarch64.*: "67.0b2"
                         default: "56.0b3"
                 release(-rc)?:
@@ -85,17 +85,17 @@ jobs:
         extra:
             product: firefox
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-linux64:
         shipping-product: firefox
@@ -109,17 +109,17 @@ jobs:
         extra:
             product: firefox
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-macosx64:
         shipping-product: firefox
@@ -133,17 +133,17 @@ jobs:
         extra:
             product: firefox
             platform: mac
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win32:
         shipping-product: firefox
@@ -157,17 +157,17 @@ jobs:
         extra:
             product: firefox
             platform: win32
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win64:
         shipping-product: firefox
@@ -181,17 +181,17 @@ jobs:
         extra:
             product: firefox
             platform: win64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     firefox-win64-aarch64:
         shipping-product: firefox
@@ -205,17 +205,17 @@ jobs:
         extra:
             product: firefox
             platform: win64-aarch64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release(-rc)?: "release-localtest"
-                    esr60: "esr-localtest"
+                    esr.*: "esr-localtest"
                     default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     devedition-linux:
         shipping-product: devedition
--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -26,38 +26,27 @@ job-defaults:
     worker:
         implementation: treescript
         dontbuild: true
         tags: ['release']
         bump: true
         bump-files:
             by-project:
                 default: ["browser/config/version_display.txt"]
-                mozilla-release:
-                    - "browser/config/version.txt"
-                    - "browser/config/version_display.txt"
-                    - "config/milestone.txt"
-                mozilla-esr52:
-                    - "browser/config/version.txt"
-                    - "browser/config/version_display.txt"
-                    - "config/milestone.txt"
-                mozilla-esr60:
+                mozilla-(release|esr.*):
                     - "browser/config/version.txt"
                     - "browser/config/version_display.txt"
                     - "config/milestone.txt"
                 jamun:
                     - "browser/config/version.txt"
                     - "browser/config/version_display.txt"
                     - "config/milestone.txt"
         push:
             by-project:
-                mozilla-beta: true
-                mozilla-release: true
-                mozilla-esr52: true
-                mozilla-esr60: true
+                mozilla-(beta|release|esr.*): true
                 maple: true
                 birch: true
                 jamun: true
                 default: false
 
 jobs:
     fennec:
         name: fennec-version-bump
--- a/taskcluster/ci/repo-update/kind.yml
+++ b/taskcluster/ci/repo-update/kind.yml
@@ -9,45 +9,33 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 
 job-defaults:
     worker:
         env:
             DO_HSTS:
                 by-project:
-                    mozilla-central: "1"
-                    mozilla-esr60: "1"
-                    mozilla-beta: "1"
+                    mozilla-(central|beta|esr.*): "1"
                     default: ""
             DO_HPKP:
                 by-project:
-                    mozilla-central: "1"
-                    mozilla-esr60: "1"
-                    mozilla-beta: "1"
+                    mozilla-(central|beta|esr.*): "1"
                     default: ""
             DO_BLOCKLIST:
                 by-project:
-                    mozilla-central: "1"
-                    mozilla-esr60: "1"
-                    mozilla-beta: "1"
-                    mozilla-release: "1"
+                    mozilla-(central|beta|release|esr.*): "1"
                     default: ""
             DO_REMOTE_SETTINGS:
                 by-project:
-                    mozilla-central: "1"
-                    mozilla-esr60: "1"
-                    mozilla-beta: "1"
-                    mozilla-release: "1"
+                    mozilla-(central|beta|release|esr.*): "1"
                     default: ""
             DO_SUFFIX_LIST:
                 by-project:
-                    mozilla-central: "1"
-                    mozilla-esr60: "1"
-                    mozilla-beta: "1"
+                    mozilla-(central|beta|esr.*): "1"
                     default: ""
             USE_MOZILLA_CENTRAL:
                 by-project:
                     mozilla-central: "1"
                     default: ""
 
 
 jobs: