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

@@ -30,12 +30,10 @@
 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',
@@ -52,27 +50,11 @@ config = {
             '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',
@@ -89,25 +71,9 @@ config = {
             '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',
     },
-
 }

taskcluster/ci/build/kind.yml

@@ -46,3 +46,11 @@ job-defaults:
             - 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

taskcluster/ci/release-update-verify-config/kind.yml

@@ -49,8 +49,7 @@ job-defaults:
             by-release-type:
                 beta: beta
                 release: nonbeta
-                nightly: beta
-                default: null
+                default: beta
         last-watershed:
             by-release-type:
                 beta:
@@ -61,8 +60,7 @@ job-defaults:
                     by-platform:
                         win64.*: "60.0"
                         default: "52.0"
-                nightly: "default"
-                default: null
+                default: "default"
 
 jobs:
     thunderbird-linux:
@@ -82,8 +80,7 @@ jobs:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
@@ -106,8 +103,7 @@ jobs:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
@@ -130,8 +126,7 @@ jobs:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
@@ -154,8 +149,7 @@ jobs:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta
@@ -178,8 +172,7 @@ jobs:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
-                    nightly: "default"
-                    default: null
+                    default: "default"
             mar-channel-id-override:
                 by-release-type:
                     beta: beta

taskcluster/ci/release-update-verify/kind.yml

@@ -40,7 +40,6 @@ job-defaults:
                     beta: "beta-localtest"
                     release: "release-localtest"
                     nightly: "nightly"
-                    default: "default"
     extra:
         chunks: 12