Bug 1501488 - Port bug 1497575: Set update channel by release type. rs=bustage-fix
authorRob Lemley <rob@thunderbird.net>
Tue, 23 Oct 2018 22:14:08 +0000
changeset 33554 abf6bb81267adb103212a2d48b3a4aad001fe0d8
parent 33553 3eb79f25d25b60d7b6e1b9e1638f795117621f66
child 33555 5c2052f239d275bedc4d23de90e4ed04382b9ecb
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersbustage-fix
bugs1501488, 1497575
Bug 1501488 - Port bug 1497575: Set update channel by release type. rs=bustage-fix Differential Revision: https://phabricator.services.mozilla.com/D9603
mozharness/builds/branch_specifics.py
taskcluster/ci/build/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
--- a/mozharness/builds/branch_specifics.py
+++ b/mozharness/builds/branch_specifics.py
@@ -25,89 +25,55 @@
 #             },
 #         }
 #     },
 # }
 
 config = {
     "comm-central": {
         "repo_path": 'comm-central',
-        "update_channel": "nightly",
     },
     "comm-beta": {
         "enable_release_promotion": True,
         'repo_path': 'releases/comm-beta',
-        'update_channel': 'beta',
         'platform_overrides': {
             'linux': {
                 'mozconfig_variant': 'release',
             },
             'linux64': {
                 'mozconfig_variant': 'release',
             },
             'macosx64': {
                 'mozconfig_variant': 'release',
             },
             'win32': {
                 'mozconfig_variant': 'release',
             },
             'win64': {
                 'mozconfig_variant': 'release',
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
         },
     },
     "comm-esr60": {
         "enable_release_promotion": True,
         'repo_path': 'releases/comm-esr60',
-        'update_channel': 'release',
         'platform_overrides': {
             'linux': {
                 'mozconfig_variant': 'release',
             },
             'linux64': {
                 'mozconfig_variant': 'release',
             },
             'macosx64': {
                 'mozconfig_variant': 'release',
             },
             'win32': {
                 'mozconfig_variant': 'release',
             },
             'win64': {
                 'mozconfig_variant': 'release',
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
         },
     },
     'try-comm-central': {
         'repo_path': 'try-comm-central',
     },
-
 }
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -41,8 +41,16 @@ job-defaults:
             - comm/rdf
             - comm/taskcluster
             - comm/testing
             - comm/.taskcluster.yml
             - comm/AUTHORS
             - comm/comm-confvars.sh
             - comm/moz.build
             - comm/moz.configure
+    run:
+        # Note: These settings are only honored by nightly (i.e. shipping) builds
+        update-channel:
+            by-release-type:
+                nightly: nightly
+                beta: beta
+                release.*: release
+                default: null
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -44,30 +44,28 @@ job-defaults:
         # 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
                 release: nonbeta
-                nightly: beta
-                default: null
+                default: beta
         last-watershed:
             by-release-type:
                 beta:
                     by-platform:
                         win64.*: "60.0b7"
                         default: "56.0b3"
                 release:
                     by-platform:
                         win64.*: "60.0"
                         default: "52.0"
-                nightly: "default"
-                default: null
+                default: "default"
 
 jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux32/opt
             kind: test
@@ -77,18 +75,17 @@ jobs:
         extra:
             product: thunderbird
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-linux64:
         shipping-product: thunderbird
         treeherder:
@@ -101,18 +98,17 @@ jobs:
         extra:
             product: thunderbird
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-macosx64:
         shipping-product: thunderbird
         treeherder:
@@ -125,18 +121,17 @@ jobs:
         extra:
             product: thunderbird
             platform: mac
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-win32:
         shipping-product: thunderbird
         treeherder:
@@ -149,18 +144,17 @@ jobs:
         extra:
             product: thunderbird
             platform: win32
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
                     default: null
 
     thunderbird-win64:
         shipping-product: thunderbird
         treeherder:
@@ -173,14 +167,13 @@ jobs:
         extra:
             product: thunderbird
             platform: win64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             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
@@ -35,17 +35,16 @@ job-defaults:
         env:
             NO_BBCONFIG: "1"
             BUILD_TOOLS_REPO: https://hg.mozilla.org/build/tools
             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: