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

Bug 1429603: Simplify generation of balrog properties in mozharness; r=jlund

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D575

--HG--
extra : rebase_source : 745f87dc835fb1908198cfae944bfde5e17127a7
This commit is contained in:
Tom Prince 2018-02-11 16:47:08 -07:00
parent b4a69b0604
commit 2dca8b7740
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
testing/mozharness/mozharness/mozilla/updates/balrog.py
View File

@ -1,4 +1,3 @@
from itertools import chain
import os
import sys
@ -27,20 +26,19 @@ class BalrogMixin(object):
else:
buildbot_properties = []
balrog_props = dict(properties=dict(chain(
buildbot_properties,
self.buildbot_properties.items(),
)))
balrog_props = {}
balrog_props.update(buildbot_properties)
balrog_props.update(self.buildbot_properties)
if self.config.get('stage_platform'):
balrog_props['properties']['stage_platform'] = self.config['stage_platform']
balrog_props['stage_platform'] = self.config['stage_platform']
if self.config.get('platform'):
balrog_props['properties']['platform'] = self.config['platform']
balrog_props['platform'] = self.config['platform']
if self.config.get('balrog_platform'):
balrog_props["properties"]["platform"] = self.config['balrog_platform']
if "branch" not in balrog_props["properties"]:
balrog_props["properties"]["branch"] = self.branch
balrog_props["platform"] = self.config['balrog_platform']
if "branch" not in balrog_props:
balrog_props["branch"] = self.branch
self.dump_config(props_path, balrog_props)
self.dump_config(props_path, {"properties": balrog_props})
def lock_balrog_rules(self, rule_ids):
c = self.config