Bug 1552389 - Follow up: Remove esr release references and use consistent regex style. r=darktrojan DONTBUILD
authorRob Lemley <rob@thunderbird.net>
Sat, 22 Jun 2019 23:18:51 -0400
changeset 35935 384e0fef96b79b5379fb97e9a953c0b3f2bf50e1
parent 35934 450a66aeeaa8bd80ee95808f2e4d1a274c7bcb14
child 35936 054b5073e463f919858eec6091e3c9779a53aa9d
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersdarktrojan
bugs1552389
Bug 1552389 - Follow up: Remove esr release references and use consistent regex style. r=darktrojan DONTBUILD No functional changes, only cleanup - We do not have any 'esr' release-types - Fixed a couple of project-type regex's so we use the same style everywhere
taskcluster/ci/beetmover-checksums/kind.yml
taskcluster/ci/beetmover-repackage/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-version-bump/kind.yml
--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -17,10 +17,10 @@ only-for-attributes:
     - shippable
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_prefix: public
         artifact_map:
             by-release-type:
-                beta|release.*|esr.*: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates_checksums.yml
+                beta|release: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates_checksums.yml
                 default: comm/taskcluster/comm_taskgraph/manifests/thunderbird_nightly_checksums.yml
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -37,10 +37,10 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_map:
             by-release-type:
-                beta|release.*|esr.*: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates.yml
+                beta|release: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates.yml
                 default: comm/taskcluster/comm_taskgraph/manifests/thunderbird_nightly.yml
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@@ -29,15 +29,15 @@ 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:
-                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
                 try-comm-central: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     thunderbird:
         shipping-product: thunderbird
--- a/taskcluster/ci/release-notify-push/kind.yml
+++ b/taskcluster/ci/release-notify-push/kind.yml
@@ -27,15 +27,15 @@ 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:
-                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
                 try-comm-central: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     thunderbird:
         shipping-product: thunderbird
--- a/taskcluster/ci/release-notify-ship/kind.yml
+++ b/taskcluster/ci/release-notify-ship/kind.yml
@@ -28,17 +28,17 @@ job-defaults:
         max-run-time: 600
         command:
             - /bin/bash
             - -c
             - echo "Dummy task"
     notifications:
         emails:
             by-project:
-                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
                 try-comm-central: ["{config[params][owner]}"]
                 default: []
 
 jobs:
     thunderbird:
         shipping-product: thunderbird
         notifications:
             subject: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} updates are ready for signoff in Balrog!"
--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -13,17 +13,17 @@ kind-dependencies:
     - release-beetmover-push-to-release
 
 job-defaults:
     description: Release Promotion version bump/tag
     run-on-projects: []
     shipping-phase: ship
     worker-type:
         by-project:
-            comm-(beta|esr.*): scriptworker-prov-v1/tb-treescript-comm-v1
+            comm-(beta|esr60|esr68): scriptworker-prov-v1/tb-treescript-comm-v1
             default: scriptworker-prov-v1/tb-treescript-comm-dev
     worker:
         implementation: treescript
         tags: ['buildN', 'release']
         bump: true
         bump-files:
             by-project:
                 default: ["mail/config/version_display.txt"]