Bug 1490094 - Follow-up: Change release-type from esr60 to release. f=tomprince, rs=jorgk
authorRob Lemley <rob@thunderbird.net>
Fri, 21 Sep 2018 10:55:42 -0400
changeset 33202 ec9dbe9537afa761d25a60365707f38de7eaa447
parent 33201 940a5071df8dd65f49e030887b1f61924e65769b
child 33203 1824f784b446e87be3d92137ed51f2fb73c3f1bd
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1490094
Bug 1490094 - Follow-up: Change release-type from esr60 to release. f=tomprince, rs=jorgk Thunderbird does not use "esr.*" as a release type. See https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/taskgraph/decision.py#l95
taskcluster/ci/release-balrog-scheduling/kind.yml
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
--- a/taskcluster/ci/release-balrog-scheduling/kind.yml
+++ b/taskcluster/ci/release-balrog-scheduling/kind.yml
@@ -27,22 +27,22 @@ jobs:
         shipping-product: thunderbird
         worker:
             product: thunderbird
             publish-rules:
                 by-release-level:
                     production:
                         by-release-type:
                             beta: [43]
-                            esr60: [820]
+                            release: [820]
                             default: []
                     staging:
                         by-release-type:
                             beta: [43]
-                            esr60: [729]
+                            release: [729]
                             default: []
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BS)
             tier: 1
             kind: build
     thunderbird-bz2:
         description: Schedule Thunderbird publishing in balrog (bz2)
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -31,34 +31,34 @@ jobs:
         name: submit-toplevel-thunderbird-release-to-balrog
         description: Submit toplevel Thunderbird release to balrog
         shipping-product: thunderbird
         worker:
             product: thunderbird
             channel-names:
                 by-release-type:
                     beta: ["beta", "beta-localtest", "beta-cdntest"]
-                    esr60: ["release", "release-localtest", "release-cdntest"]
+                    release: ["release", "release-localtest", "release-cdntest"]
                     default: []
             publish-rules:
                 by-release-level:
                     production:
                         by-release-type:
                             beta: [43]
-                            esr60: [820]
+                            release: [820]
                             default: []
                     staging:
                         by-release-type:
                             beta: [43]
-                            esr60: [729]
+                            release: [729]
                             default: []
             rules-to-update:
                 by-release-type:
                     beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
-                    esr60: ["thunderbird-release60-cdntest", "thunderbird-release60-localtest"]
+                    release: ["thunderbird-release60-cdntest", "thunderbird-release60-localtest"]
                     default: []
             platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BPTb)
             tier: 1
             kind: build
 
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -43,26 +43,29 @@ job-defaults:
         # This is overridden for devedition to exclude 58.0b1
         # 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
-                esr60: nonbeta
+                release: nonbeta
                 nightly: beta
                 default: null
         last-watershed:
             by-release-type:
                 beta:
                     by-platform:
                         win64.*: "60.0b7"
                         default: "56.0b3"
-                esr60: "52.0"
+                release:
+                    by-platform:
+                        win64.*: "60.0"
+                        default: "52.0"
                 nightly: "default"
                 default: null
 
 jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
@@ -73,17 +76,17 @@ jobs:
             build_platform: linux-nightly
         extra:
             product: thunderbird
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "default"
                     default: null
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-linux64:
@@ -97,17 +100,17 @@ jobs:
             build_platform: linux64-nightly
         extra:
             product: thunderbird
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "default"
                     default: null
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-macosx64:
@@ -121,17 +124,17 @@ jobs:
             build_platform: macosx64-nightly
         extra:
             product: thunderbird
             platform: mac
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "default"
                     default: null
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-win32:
@@ -145,17 +148,17 @@ jobs:
             build_platform: win32-nightly
         extra:
             product: thunderbird
             platform: win32
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "default"
                     default: null
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-win64:
@@ -169,15 +172,15 @@ jobs:
             build_platform: win64-nightly
         extra:
             product: thunderbird
             platform: win64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "default"
                     default: null
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -33,17 +33,17 @@ job-defaults:
         retry-exit-status:
             - 255
         env:
             NO_BBCONFIG: "1"
             BUILD_TOOLS_REPO: https://hg.mozilla.org/build/tools
             CHANNEL:
                 by-release-type:
                     beta: "beta-localtest"
-                    esr60: "release-localtest"
+                    release: "release-localtest"
                     nightly: "nightly"
                     default: "default"
     extra:
         chunks: 12
 
 jobs:
     thunderbird-linux64:
         description: linux64 update verify