Bug 1610361 - Remove references to comm-esr60 from Taskcluster configs. r=darktrojan a=mkmelin
authorRob Lemley <rob@thunderbird.net>
Mon, 20 Jan 2020 13:51:03 -0500
changeset 37012 3249d2340a6a4f10d0dda9c9480864488a2df636
parent 37011 412d38997e6342a26a1cdc83fc2a0d46058cad49
child 37013 f912e26e5a2091f0478afb3958c97a95e5607db7
push id2548
push userthunderbird@calypsoblue.org
push dateThu, 30 Jan 2020 20:54:16 +0000
treeherdercomm-beta@f6219b04be6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan, mkmelin
bugs1610361
Bug 1610361 - Remove references to comm-esr60 from Taskcluster configs. r=darktrojan a=mkmelin
taskcluster/ci/config.yml
taskcluster/ci/release-bouncer-aliases/kind.yml
taskcluster/ci/release-bouncer-check/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-version-bump/kind.yml
taskcluster/ci/repo-update/kind.yml
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -76,17 +76,17 @@ scriptworker:
             - 'project:comm:thunderbird:releng:balrog:server:release'
 
 partner-urls:
     release-partner-repack: {}
     release-eme-free-repack: {}
 
 task-priority:
     by-project:
-        'comm-(esr60|esr68)': 'very-high'
+        'comm-esr68': 'very-high'
         'comm-beta': 'high'
         'comm-central': 'medium'
         'default': 'low'
 
 workers:
     aliases:
         b-linux.*:
             provisioner: 'comm-{level}'
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -38,19 +38,16 @@ job-defaults:
 jobs:
     thunderbird:
         bouncer-products-per-alias:
             by-project:
                 comm-beta:
                     thunderbird-beta-latest-ssl: installer-ssl
                     thunderbird-beta-latest: installer
                     thunderbird-beta-msi-latest-ssl: msi
-                comm-esr60:
-                    thunderbird-latest-ssl: installer-ssl
-                    thunderbird-latest: installer
                 comm-esr68:
                     thunderbird-latest-ssl: installer-ssl
                     thunderbird-latest: installer
                     thunderbird-msi-latest-ssl: msi
                 default: {}
         shipping-product: thunderbird
         treeherder:
             platform: thunderbird-release/opt
--- a/taskcluster/ci/release-bouncer-check/kind.yml
+++ b/taskcluster/ci/release-bouncer-check/kind.yml
@@ -39,16 +39,16 @@ jobs:
             product: thunderbird
             job-name: thunderbird-bouncer-check
         run:
             comm-checkout: true
             config:
                 - comm/mozharness/releases/bouncer_thunderbird.py
             extra-config:
                 by-project:
-                    comm-(beta|esr60|esr68):
+                    comm-(beta|esr68):
                         locales: ['en-US', 'fr', 'de']
                         bouncer_prefix: "https://download.mozilla.org/"
                     default:
                         locales: ['en-US', 'fr', 'de']
                         bouncer_prefix: "https://bouncer-bouncer-releng.stage.mozaws.net/"
         treeherder:
             platform: thunderbird-release/opt
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@@ -22,15 +22,15 @@ job-defaults:
     worker-type: succeed
     worker:
         implementation: succeed
     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|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|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
@@ -20,15 +20,15 @@ job-defaults:
     worker-type: succeed
     worker:
         implementation: succeed
     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|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|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
@@ -21,17 +21,17 @@ job-defaults:
     run-on-projects: []
     shipping-phase: ship
     worker-type: succeed
     worker:
         implementation: succeed
     notifications:
         emails:
             by-project:
-                comm-(beta|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|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-notify-started/kind.yml
+++ b/taskcluster/ci/release-notify-started/kind.yml
@@ -16,15 +16,15 @@ 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:
-            comm-(beta|esr60|esr68): ["thunderbird-drivers@mozilla.org"]
+            comm-(beta|esr68): ["thunderbird-drivers@mozilla.org"]
             try-comm-central: ["{config[params][owner]}"]
             default: []
 
 jobs:
     thunderbird:
         shipping-product: thunderbird
--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -13,32 +13,32 @@ 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|esr60|esr68): scriptworker-k8s/comm-3-tree
+            comm-(beta|esr68): scriptworker-k8s/comm-3-tree
             default: scriptworker-k8s/comm-1-tree
     worker:
         implementation: treescript
         dontbuild: true
         tags: ['buildN', 'release']
         bump: true
         bump-files:
             by-project:
                 default: ["mail/config/version_display.txt"]
-                comm-(beta|esr60|esr68):
+                comm-(beta|esr68):
                     - "mail/config/version.txt"
                     - "mail/config/version_display.txt"
         push:
             by-project:
-                comm-(beta|esr60|esr68): true
+                comm-(beta|esr68): true
                 default: false
 
 jobs:
     thunderbird-comm:
         name: thunderbird-comm-version-bump
         worker:
             repo-param-prefix: comm_
         shipping-product: thunderbird
--- a/taskcluster/ci/repo-update/kind.yml
+++ b/taskcluster/ci/repo-update/kind.yml
@@ -10,17 +10,17 @@ transforms:
 
 
 job-defaults:
     worker:
         env:
             DO_BLOCKLIST:
                 by-project:
                     comm-central: "1"
-                    comm-(beta|esr60|esr68): "1"
+                    comm-(beta|esr68): "1"
                     default: ""
             USE_MOZILLA_CENTRAL: ""
             DONTBUILD: "1"
 
 
 jobs:
     blocklist-update:
         name: periodic_file_update