Bug 1538134: [mozharness] Don't override PGO settings per-branch; r=aki
authorTom Prince <mozilla@hocat.ca>
Mon, 25 Mar 2019 16:03:12 +0000
changeset 525735 5903d728d99a36e4244c608c4fa866a93310cc00
parent 525734 3c0a452881327cecc40fe36a073c077e0f26f188
child 525736 3a81fd4a729b5a850b9ba3ece1ad7625b5f13205
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1538134
milestone67.0
Bug 1538134: [mozharness] Don't override PGO settings per-branch; r=aki The release mozconfigs set `MOZ_PGO` and all shipping builds set the `nightly` mozharness config, so we don't need to additionaly set PGO based on the branch. Differential Revision: https://phabricator.services.mozilla.com/D24563
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
@@ -26,41 +26,35 @@
 #     },
 # }
 
 config = {
     ### release branches
     "mozilla-central": {
     },
     'mozilla-release': {
-        'branch_uses_per_checkin_strategy': True,
     },
     'mozilla-esr60': {
-        'branch_uses_per_checkin_strategy': True,
     },
     'mozilla-beta': {
-        'branch_uses_per_checkin_strategy': True,
     },
     'try': {
         'branch_supports_uploadsymbols': False,
     },
 
     ### project branches
     #'fx-team': {},   #Bug 1296396
     'gum': {
-        'branch_uses_per_checkin_strategy': True,
     },
     'mozilla-inbound': {
     },
     'autoland': {
     },
     'ux': {},
     'cypress': {
-        # bug 1164935
-        'branch_uses_per_checkin_strategy': True,
     },
 
     ### other branches that do not require anything special:
     'alder': {},
     'ash': {},
     'birch': {},
     # 'build-system': {}
     'cedar': {},
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -843,23 +843,21 @@ or run without that action (ie: --no-{ac
         return mach_env
 
     def _compile_against_pgo(self):
         """determines whether a build should be run with pgo even if it is
         not a classified as a 'pgo build'.
 
         requirements:
         1) must be a platform that can run against pgo
-        2) either:
-            a) must be a nightly build
-            b) must be on a branch that runs pgo if it can everytime
+        2) must be a nightly build
         """
         c = self.config
         if self.stage_platform in c['pgo_platforms']:
-            if c.get('branch_uses_per_checkin_strategy') or self.query_is_nightly():
+            if self.query_is_nightly():
                 return True
         return False
 
     def query_check_test_env(self):
         c = self.config
         dirs = self.query_abs_dirs()
         check_test_env = {}
         if c.get('check_test_env'):