Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1538134: [mozharness] Don't override PGO settings per-branch; r=aki

Browse Source 
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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Prince 2019-03-25 16:03:12 +00:00
parent fe6fa9692b
commit 28765a7030
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/mozharness/configs/builds/branch_specifics.py
View File

@ -31,13 +31,10 @@ config = {
"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,
@ -46,7 +43,6 @@ config = {
### project branches
#'fx-team': {}, #Bug 1296396
'gum': {
'branch_uses_per_checkin_strategy': True,
},
'mozilla-inbound': {
},
@ -54,8 +50,6 @@ config = {
},
'ux': {},
'cypress': {
# bug 1164935
'branch_uses_per_checkin_strategy': True,
},
### other branches that do not require anything special:

6
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -851,13 +851,11 @@ or run without that action (ie: --no-{action})"
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