Bug 1552389 - Port bug 1551738: Add in-tree support for esr68. r=darktrojan,jorgk
authorRob Lemley <rob@thunderbird.net>
Thu, 16 May 2019 22:01:34 -0400
changeset 35654 961f2ce1e0e738be4999e0d1b67e5c8d4338015d
parent 35653 8d9eeaf48a3015150a83d5f6e3ce5087e63d2879
child 35655 df9479faea454dbec79b8cde400396a56830d93b
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersdarktrojan, jorgk
bugs1552389, 1551738
Bug 1552389 - Port bug 1551738: Add in-tree support for esr68. r=darktrojan,jorgk
taskcluster/ci/config.yml
taskcluster/ci/release-notify-promote/kind.yml
taskcluster/ci/release-notify-ship/kind.yml
taskcluster/ci/release-notify-started/kind.yml
taskcluster/ci/release-update-verify/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
@@ -81,17 +81,17 @@ scriptworker:
             - 'project:comm:thunderbird:releng:balrog:server:release'
 
 partner-urls:
     release-partner-repack: {}
     release-eme-free-repack: {}
 
 task-priority:
     by-project:
-        'comm-esr60': 'very-high'
+        'comm-(esr60|esr68)': 'very-high'
         'comm-beta': 'high'
         'comm-central': 'medium'
         'default': 'low'
 
 workers:
     aliases:
         b-linux.*:
             provisioner: aws-provisioner-v1
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@@ -29,16 +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"]
                 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
@@ -29,17 +29,17 @@ job-defaults:
         command:
             - /bin/bash
             - -c
             - echo "Dummy task"
     notifications:
         emails:
             by-project:
                 comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
-                try: ["{config[params][owner]}"]
+                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!"
             message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} updates are ready for signoff in Balrog!"
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/release-notify-started/kind.yml
@@ -0,0 +1,30 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: taskgraph.loader.transform:loader
+
+transforms:
+    - taskgraph.transforms.release_deps:transforms
+    - taskgraph.transforms.release_started:transforms
+    - taskgraph.transforms.job:transforms
+    - taskgraph.transforms.task:transforms
+
+job-defaults:
+    name: notify-release-drivers-started
+    description: Sends email to release-drivers telling release was started.
+    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"]
+            try-comm-central: ["{config[params][owner]}"]
+            default: []
+
+jobs:
+    thunderbird:
+        shipping-product: thunderbird
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -26,23 +26,16 @@ job-defaults:
             - name: 'public/build/diff-summary.log'
               path: '/builds/worker/tools/release/updates/diff-summary.log'
               type: file
         docker-image:
             in-tree: "update-verify"
         max-run-time: 7200
         retry-exit-status:
             - 255
-        env:
-            CHANNEL:
-                by-release-type:
-                    beta: "beta-localtest"
-                    release: "release-localtest"
-                    nightly: "nightly"
-                    default: "default"
     extra:
         chunks: 12
 
 jobs:
     thunderbird-linux64:
         description: linux64 update verify
         shipping-product: thunderbird
         treeherder:
--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -13,31 +13,31 @@ 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): scriptworker-prov-v1/tb-treescript-comm-v1
+            comm-(beta|esr.*): 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"]
-                comm-(beta|esr60):
+                comm-(beta|esr60|esr68):
                     - "mail/config/version.txt"
                     - "mail/config/version_display.txt"
         push:
             by-project:
-                comm-(beta|esr60): true
+                comm-(beta|esr60|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,18 +10,17 @@ transforms:
 
 
 job-defaults:
     worker:
         env:
             DO_BLOCKLIST:
                 by-project:
                     comm-central: "1"
-                    comm-esr60: "1"
-                    comm-beta: "1"
+                    comm-(beta|esr60|esr68): "1"
                     default: ""
             USE_MOZILLA_CENTRAL: ""
 
 
 jobs:
     blocklist-update:
         name: periodic_file_update
         description: Blocklist update