bug 1324922 stop balrog updates before funsize does its thing r=catlee draft
authorSimon Fraser <sfraser@mozilla.com>
Fri, 12 May 2017 15:19:09 +0100
changeset 576938 890dd9e1e837487ebd855c1f2de6f67f748f0d3b
parent 576745 8a7d0b15595f9916123848ca906f29c62d4914c9
child 628360 317a5076dca2dab1ebd804dbe94781b8e13660d2
push id58536
push usersfraser@mozilla.com
push dateFri, 12 May 2017 14:19:30 +0000
reviewerscatlee
bugs1324922
milestone55.0a1
bug 1324922 stop balrog updates before funsize does its thing r=catlee MozReview-Commit-ID: 6XQ76RXev6U
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -61,17 +61,16 @@ config = {
     'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': True,
     'enable_talos_sendchange': False,
     'enable_unittest_sendchange': True,
-    'skip_balrog_uploads': True, # If True, rely on Funsize to update Balrog
     #########################################################################
 
 
     #########################################################################
     ###### 32 bit specific ######
     'base_name': 'Linux_%(branch)s',
     'platform': 'linux',
     'stage_platform': 'linux',
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -60,17 +60,16 @@ config = {
     'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': True,
     'enable_talos_sendchange': False,
     'enable_unittest_sendchange': True,
-    'skip_balrog_uploads': True, # If True, rely on Funsize to update Balrog
     #########################################################################
 
 
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'Linux_x86-64_%(branch)s',
     'platform': 'linux64',
     'stage_platform': 'linux64',
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -2169,30 +2169,16 @@ or run without that action (ie: --no-{ac
         # generate balrog props as artifacts
         if self.config.get('taskcluster_nightly'):
             env = self.query_mach_build_env(multiLocale=False)
             props_path = os.path.join(env["UPLOAD_PATH"],
                     'balrog_props.json')
             self.generate_balrog_props(props_path)
             return
 
-        if self.config.get('skip_balrog_uploads'):
-            self.info("Funsize will submit to balrog, skipping submission here.")
-            return
-
-        if not self.config.get("balrog_servers"):
-            self.fatal("balrog_servers not set; skipping balrog submission.")
-            return
-
-        if self.submit_balrog_updates():
-            # set the build to orange so it is at least caught
-            self.return_code = self.worst_level(
-                EXIT_STATUS_DICT[TBPL_WARNING], self.return_code,
-                AUTOMATION_EXIT_CODES[::-1]
-            )
 
     def valgrind_test(self):
         '''Execute mach's valgrind-test for memory leaks'''
         env = self.query_build_env()
         env.update(self.query_mach_build_env())
 
         python = self.query_exe('python2.7')
         return_code = self.run_command_m(