Port changesets from bug 1490094 and bug 1487172. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Tue, 18 Sep 2018 11:13:37 +0200
changeset 33176 03d79b0cf04825ec9cd17a9d254df09f74bf1e71
parent 33175 4769902c580ea46024026dba447f5a256ef66114
child 33177 5d2710bb0b4e33787c9ff135ce472c7af6e5177a
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix
bugs1490094, 1487172
Port changesets from bug 1490094 and bug 1487172. rs=bustage-fix
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
@@ -1,15 +1,16 @@
 # 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:run_on_releases
     - taskgraph.transforms.release_deps:transforms
     - taskgraph.transforms.scriptworker:add_balrog_scopes
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - release-bouncer-check
 
 job-defaults:
@@ -22,34 +23,38 @@ job-defaults:
 jobs:
     thunderbird:
         description: Schedule Thunderbird publishing in balrog
         name: release-thunderbird_schedule_publishing_in_balrog
         shipping-product: thunderbird
         worker:
             product: thunderbird
             publish-rules:
-                by-project:
-                    comm-beta: [43]
-                    comm-esr60: [820]
-                    default: []
+                by-release-level:
+                    production:
+                        by-release-type:
+                            beta: [43]
+                            esr60: [820]
+                            default: []
+                    staging:
+                        by-release-type:
+                            beta: [43]
+                            esr60: [820]
+                            default: []
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BS)
             tier: 1
             kind: build
-    # FIXME: (Bug 1487172) This task should only run on esr60-like branches
     thunderbird-bz2:
         description: Schedule Thunderbird publishing in balrog (bz2)
         name: release-thunderbird_schedule_publishing_in_balrog-bz2
         shipping-product: thunderbird
+        run-on-releases: [esr60]
         worker:
             product: thunderbird
-            publish-rules:
-                by-project:
-                    comm-esr60: [516]
-                    default: []
+            publish-rules: [516]
             blob-suffix: -bz2
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BS-bz2)
             tier: 1
             kind: build
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -1,15 +1,16 @@
 # 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:run_on_releases
     - taskgraph.transforms.release_deps:transforms
     - taskgraph.transforms.scriptworker:add_balrog_scopes
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     run-on-projects: []  # to make sure this never runs in CI
     shipping-phase: promote
     worker:
@@ -28,56 +29,57 @@ job-defaults:
 jobs:
     thunderbird:
         name: submit-toplevel-thunderbird-release-to-balrog
         description: Submit toplevel Thunderbird release to balrog
         shipping-product: thunderbird
         worker:
             product: thunderbird
             channel-names:
-                by-project:
-                    comm-beta: ["beta", "beta-localtest", "beta-cdntest"]
-                    comm-esr.*: ["release", "release-localtest", "release-cdntest"]
+                by-release-type:
+                    beta: ["beta", "beta-localtest", "beta-cdntest"]
+                    esr60: ["release", "release-localtest", "release-cdntest"]
                     default: []
             publish-rules:
-                by-project:
-                    comm-beta: [43]
-                    comm-esr60: [820]
-                    default: []
+                by-release-level:
+                    production:
+                        by-release-type:
+                            beta: [43]
+                            esr60: [820]
+                            default: []
+                    staging:
+                        by-release-type:
+                            beta: [43]
+                            esr60: [820]
+                            default: []
             rules-to-update:
-                by-project:
-                    comm-beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
-                    comm-esr60: ["thunderbird-release60-cdntest", "thunderbird-release60-localtest"]
+                by-release-type:
+                    beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
+                    esr60: ["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
 
-    # FIXME: (Bug 1487172) This task should only run on esr60-like branches
     thunderbird-bz2:
         name: submit-toplevel-thunderbird-release-to-balrog-bz2
         description: Submit toplevel Thunderbird release to balrog (bz2)
         shipping-product: thunderbird
+        run-on-releases: [esr60]
         worker:
             product: thunderbird
-            channel-names:
-                by-project:
-                    comm-esr60: ["release", "release-localtest", "release-cdntest"]
-                    default: []
+            channel-names: ["release", "release-localtest", "release-cdntest"]
             publish-rules:
-                by-project:
-                    comm-esr60: [516]
-                    default: []
-            rules-to-update:
-                by-project:
-                    comm-esr60: ["thunderbird-esr52-cdntest", "thunderbird-esr52-localtest"]
-                    default: []
+                by-release-level:
+                    production: [516]
+                    staging: [516]
+            rules-to-update: ["thunderbird-esr52-cdntest", "thunderbird-esr52-localtest"]
             platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
             blob-suffix: -bz2
             complete-mar-filename-pattern: '%s-%s.bz2.complete.mar'
             complete-mar-bouncer-product-pattern: '%s-%s-complete-bz2'
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BPTb-bz2)
             tier: 1
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -41,26 +41,29 @@ job-defaults:
                 staging: "https://aus5.stage.mozaws.net"
                 production: "https://aus5.mozilla.org"
         # 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-project:
-                comm-beta: beta
-                default: beta
+            by-release-type:
+                beta: beta
+                esr60: nonbeta
+                nightly: beta
+                default: null
         last-watershed:
-            by-project:
-                comm-beta:
+            by-release-type:
+                beta:
                     by-platform:
                         win64.*: "60.0b7"
                         default: "56.0b3"
-                comm-esr60: "52.0"
+                esr60: "52.0"
+                nightly: "default"
                 default: null
 
 jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux32/opt
@@ -68,108 +71,113 @@ jobs:
             tier: 1
         attributes:
             build_platform: linux-nightly
         extra:
             product: thunderbird
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    comm-esr.*: "release-localtest"
-                    default: "default"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "default"
+                    default: null
             mar-channel-id-override:
-                by-project:
-                    comm-beta: beta
+                by-release-type:
+                    beta: beta
                     default: null
 
     thunderbird-linux64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux64/opt
             kind: test
             tier: 1
         attributes:
             build_platform: linux64-nightly
         extra:
             product: thunderbird
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    comm-esr.*: "release-localtest"
-                    default: "default"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "default"
+                    default: null
             mar-channel-id-override:
-                by-project:
-                    comm-beta: beta
+                by-release-type:
+                    beta: beta
                     default: null
 
     thunderbird-macosx64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: osx-cross/opt
             kind: test
             tier: 1
         attributes:
             build_platform: macosx64-nightly
         extra:
             product: thunderbird
             platform: mac
             updater-platform: linux-x86_64
             channel:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    comm-esr.*: "release-localtest"
-                    default: "default"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "default"
+                    default: null
             mar-channel-id-override:
-                by-project:
-                    comm-beta: beta
+                by-release-type:
+                    beta: beta
                     default: null
 
     thunderbird-win32:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-32/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win32-nightly
         extra:
             product: thunderbird
             platform: win32
             updater-platform: linux-x86_64
             channel:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    default: "default"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "default"
+                    default: null
             mar-channel-id-override:
-                by-project:
-                    comm-beta: beta
-                    try-comm-central: beta
+                by-release-type:
+                    beta: beta
                     default: null
 
     thunderbird-win64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-64/opt
             kind: test
             tier: 1
         attributes:
             build_platform: win64-nightly
         extra:
             product: thunderbird
             platform: win64
             updater-platform: linux-x86_64
             channel:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    comm-esr.*: "release-localtest"
-                    default: "default"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "default"
+                    default: null
             mar-channel-id-override:
-                by-project:
-                    comm-beta: beta
+                by-release-type:
+                    beta: beta
                     default: null
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -31,19 +31,20 @@ job-defaults:
             in-tree: "update-verify"
         max-run-time: 7200
         retry-exit-status:
             - 255
         env:
             NO_BBCONFIG: "1"
             BUILD_TOOLS_REPO: https://hg.mozilla.org/build/tools
             CHANNEL:
-                by-project:
-                    comm-beta: "beta-localtest"
-                    comm-esr.*: "release-localtest"
+                by-release-type:
+                    beta: "beta-localtest"
+                    esr60: "release-localtest"
+                    nightly: "nightly"
                     default: "default"
     extra:
         chunks: 12
 
 jobs:
     thunderbird-linux64:
         description: linux64 update verify
         shipping-product: thunderbird