Bug 1429603: Stop looking at properties from buildbot when generating balrog properties in mozharness; r=jlund

Note that this still looks at "buildbot properties" set by mozharness itself.

Differential Revision: https://phabricator.services.mozilla.com/D576

--HG--
extra : rebase_source : 7e4771d4f1ffdf0959068462ead1b9b2e1154c64
This commit is contained in:
Tom Prince 2018-02-11 16:50:47 -07:00
parent 2dca8b7740
commit 2b592ef224

View File

@ -15,19 +15,12 @@ class BalrogMixin(object):
python = 'python2.7'
return python
def generate_balrog_props(self, props_path):
self.set_buildbot_property(
"hashType", self.config.get("hash_type", "sha512"), write_to_file=True
)
if self.buildbot_config and "properties" in self.buildbot_config:
buildbot_properties = self.buildbot_config["properties"].items()
else:
buildbot_properties = []
balrog_props = {}
balrog_props.update(buildbot_properties)
balrog_props.update(self.buildbot_properties)
if self.config.get('stage_platform'):
balrog_props['stage_platform'] = self.config['stage_platform']