Bug 1498028: [mozharness] Only set UPDATE_CHANNEL on nightly builds; r=aki
authorTom Prince <mozilla@hocat.ca>
Fri, 12 Oct 2018 20:54:05 +0000
changeset 499386 67560e4bba2ccb548cafe53958eb9eb4e8033d5a
parent 499385 10dc6af46fbf04a72b7940a3b715c87f9f32cee6
child 499387 9626e5c3b4a44d81d34ee5f9a2e65c005c59cc75
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1498028
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1498028: [mozharness] Only set UPDATE_CHANNEL on nightly builds; r=aki There is currently a bunch of branch-specific configuration to set non-nightly builds to have the default update channel on release branches. This allows us to get rid of that configuration. Differential Revision: https://phabricator.services.mozilla.com/D8295
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -49,61 +49,16 @@ config = {
                 'mozconfig_variant': 'release',
             },
             'win32': {
                 'mozconfig_variant': 'release',
             },
             'win64': {
                 'mozconfig_variant': 'release',
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an': {
-                'update_channel': 'default',
-            },
-            'linux64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
-            'win32-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
-            'win64-add-on-devel': {
-                'update_channel': 'default',
-            },
         },
     },
     'mozilla-esr60': {
         'enable_release_promotion': True,
         'repo_path': 'releases/mozilla-esr60',
         'update_channel': 'esr',
         'branch_uses_per_checkin_strategy': True,
         'platform_overrides': {
@@ -120,61 +75,16 @@ config = {
                 'mozconfig_variant': 'release',
             },
             'win32': {
                 'mozconfig_variant': 'release',
             },
             'win64': {
                 'mozconfig_variant': 'release',
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an': {
-                'update_channel': 'default',
-            },
-            'linux64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
-            'win32-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
-            'win64-add-on-devel': {
-                'update_channel': 'default',
-            },
         },
     },
     'mozilla-beta': {
         'enable_release_promotion': 1,
         'repo_path': 'releases/mozilla-beta',
         'update_channel': 'beta',
         'branch_uses_per_checkin_strategy': True,
         'platform_overrides': {
@@ -203,61 +113,16 @@ config = {
                 "update_channel": "aurora",
             },
             'win32-devedition': {
                 "update_channel": "aurora",
             },
             'win64-devedition': {
                 "update_channel": "aurora",
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an': {
-                'update_channel': 'default',
-            },
-            'linux64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
-            'win32-add-on-devel': {
-                'update_channel': 'default',
-            },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
-            'win64-add-on-devel': {
-                'update_channel': 'default',
-            },
         },
     },
     'mozilla-aurora': {
         'repo_path': 'releases/mozilla-aurora',
         'update_channel': 'aurora',
         'branch_uses_per_checkin_strategy': True,
     },
     'try': {
@@ -294,61 +159,28 @@ config = {
     # 'holly': {},
     'jamun': {
         'update_channel': 'beta',
         'enable_release_promotion': 1,
         'platform_overrides': {
             'linux': {
                 'mozconfig_variant': 'release',
             },
-            'linux-debug': {
-                'update_channel': 'default',
-            },
             'linux64': {
                 'mozconfig_variant': 'release',
             },
-            'linux64-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-asan': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an-debug': {
-                'update_channel': 'default',
-            },
-            'linux64-st-an': {
-                'update_channel': 'default',
-            },
             'macosx64': {
                 'mozconfig_variant': 'release',
             },
-            'macosx64-debug': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an': {
-                'update_channel': 'default',
-            },
-            'macosx64-st-an-debug': {
-                'update_channel': 'default',
-            },
             'win32': {
                 'mozconfig_variant': 'release',
             },
-            'win32-debug': {
-                'update_channel': 'default',
-            },
             'win64': {
                 'mozconfig_variant': 'release',
             },
-            'win64-debug': {
-                'update_channel': 'default',
-            },
             'linux-devedition': {
                 "update_channel": "aurora",
             },
             'linux64-devedition': {
                 "update_channel": "aurora",
             },
             'macosx64-devedition': {
                 "update_channel": "aurora",
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -840,29 +840,25 @@ or run without that action (ie: --no-{ac
         repo_path = self._query_repo()
         assert repo_path
         env['MOZ_SOURCE_REPO'] = repo_path
 
         if self.query_is_nightly() or self.query_is_nightly_promotion():
             # in branch_specifics.py we might set update_channel explicitly
             if c.get('update_channel'):
                 env["MOZ_UPDATE_CHANNEL"] = c['update_channel']
+            elif c.get('enable_release_promotion'):
+                env["MOZ_UPDATE_CHANNEL"] = self.branch
             else:  # let's just give the generic channel based on branch
                 env["MOZ_UPDATE_CHANNEL"] = "nightly-%s" % (self.branch,)
+            self.info("Update channel set to: {}".format(env["MOZ_UPDATE_CHANNEL"]))
 
         if self.config.get('pgo_build') or self._compile_against_pgo():
             env['MOZ_PGO'] = '1'
 
-        # to activate the right behaviour in mozonfigs while we transition
-        if c.get('enable_release_promotion'):
-            update_channel = c.get('update_channel', self.branch)
-            self.info("Release promotion update channel: %s"
-                      % (update_channel,))
-            env["MOZ_UPDATE_CHANNEL"] = update_channel
-
         return env
 
     def query_mach_build_env(self, multiLocale=None):
         c = self.config
         if multiLocale is None and self.query_is_nightly():
             multiLocale = c.get('multi_locale', False)
         mach_env = {}
         if c.get('upload_env'):