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 --HG-- extra : moz-landing-system : lando
dothq · May 15, 2019 · 8278e0e · 8278e0e
1 parent 428ae7c
commit 8278e0e
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 54 deletions.
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
@@ -264,7 +264,7 @@ partner-urls:
 task-priority:
     by-project:
         'mozilla-release': 'highest'
-        'mozilla-esr60': 'very-high'
+        'mozilla-esr.*': 'very-high'
         'mozilla-beta': 'high'
         'mozilla-central': 'medium'
         'autoland': 'low'

diff --git a/taskcluster/ci/release-early-tagging/kind.yml b/taskcluster/ci/release-early-tagging/kind.yml
@@ -27,10 +27,7 @@ job-defaults:
         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

diff --git a/taskcluster/ci/release-notify-promote/kind.yml b/taskcluster/ci/release-notify-promote/kind.yml
@@ -34,9 +34,7 @@ job-defaults:
         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: ["[email protected]"]
-                mozilla-release: ["[email protected]"]
-                mozilla-esr60: ["[email protected]"]
+                mozilla-(beta|release|esr.*): ["[email protected]"]
                 try: ["{config[params][owner]}"]
                 default: []
 

diff --git a/taskcluster/ci/release-notify-push/kind.yml b/taskcluster/ci/release-notify-push/kind.yml
@@ -32,9 +32,7 @@ job-defaults:
         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: ["[email protected]"]
-                mozilla-release: ["[email protected]"]
-                mozilla-esr60: ["[email protected]"]
+                mozilla-(beta|release|esr.*): ["[email protected]"]
                 try: ["{config[params][owner]}"]
                 default: []
 

diff --git a/taskcluster/ci/release-notify-ship/kind.yml b/taskcluster/ci/release-notify-ship/kind.yml
@@ -34,9 +34,7 @@ job-defaults:
     notifications:
         emails:
             by-project:
-                mozilla-beta: ["[email protected]"]
-                mozilla-release: ["[email protected]"]
-                mozilla-esr60: ["[email protected]"]
+                mozilla-(beta|release|esr.*): ["[email protected]"]
                 try: ["{config[params][owner]}"]
                 default: []
 

diff --git a/taskcluster/ci/release-notify-started/kind.yml b/taskcluster/ci/release-notify-started/kind.yml
@@ -21,9 +21,7 @@ job-defaults:
         max-run-time: 600
     emails:
         by-project:
-            mozilla-beta: ["[email protected]"]
-            mozilla-release: ["[email protected]"]
-            mozilla-esr60: ["[email protected]"]
+            mozilla-(beta|release|esr.*): ["[email protected]"]
             try: ["{config[params][owner]}"]
             default: []
 

diff --git a/taskcluster/ci/release-update-verify-config/kind.yml b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -52,7 +52,7 @@ job-defaults:
             by-release-type:
                 beta: beta
                 release(-rc)?: nonbeta
-                esr60: esr
+                esr.*: esr
                 default: beta
         last-watershed:
             by-release-type:
@@ -90,7 +90,7 @@ jobs:
                 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:
@@ -114,7 +114,7 @@ jobs:
                 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:
@@ -138,7 +138,7 @@ jobs:
                 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:
@@ -162,7 +162,7 @@ jobs:
                 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:
@@ -186,7 +186,7 @@ jobs:
                 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:
@@ -210,7 +210,7 @@ jobs:
                 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:

diff --git a/taskcluster/ci/release-version-bump/kind.yml b/taskcluster/ci/release-version-bump/kind.yml
@@ -31,15 +31,7 @@ job-defaults:
         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"
@@ -49,10 +41,7 @@ job-defaults:
                     - "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

diff --git a/taskcluster/ci/repo-update/kind.yml b/taskcluster/ci/repo-update/kind.yml
@@ -14,35 +14,23 @@ job-defaults:
         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: