Bug 1188351 - Don't output commit messages in the mozharness log output

Since it can cause false positives with Treeherder's log parsers, when the
commit messages contain things like:
"Bug X - Fix TEST-UNEXPECTED-FAIL ..."

If buildbot/mozharness behaviour that relies upon the commit messages (eg try
chooser) needs to be debugged, the commit messages for the push in question can
be easily looked up using the revision property, which will still be in the log.

Instead of the entire config object being dumped to the log:
https://bugzilla.mozilla.org/show_bug.cgi?id=1188351#c4

Now only the 'properties' key within is output, and then only after the
'commit_titles' sub-key is deleted.
This commit is contained in:
Ed Morley 2015-12-16 19:43:29 +00:00
parent 88ce5f0974
commit 57f5370897

View File

@ -8,6 +8,7 @@
Ideally this will go away if and when we retire buildbot.
"""
import copy
import os
import re
import sys
@ -61,8 +62,13 @@ class BuildbotMixin(object):
else:
# TODO try/except?
self.buildbot_config = parse_config_file(c['buildbot_json_path'])
buildbot_properties = copy.deepcopy(self.buildbot_config.get('properties', {}))
if 'commit_titles' in buildbot_properties:
# Remove the commit messages since they can cause false positives with
# Treeherder log parsers. Eg: "Bug X - Fix TEST-UNEPXECTED-FAIL ...".
del buildbot_properties['commit_titles']
self.info("Using buildbot properties:")
self.info(json.dumps(self.buildbot_config, indent=4))
self.info(json.dumps(buildbot_properties, indent=4))
def tryserver_email(self):
pass