diff options
author | Magnus Granberg <zorry@gentoo.org> | 2021-04-04 22:26:01 +0200 |
---|---|---|
committer | Magnus Granberg <zorry@gentoo.org> | 2021-04-04 22:26:01 +0200 |
commit | 915abba59f59767d341bb190de5bba5ae03097d0 (patch) | |
tree | c938118b7214f332d915256a7952c33759f4d16a | |
parent | Don't collaps builds (diff) | |
download | tinderbox-cluster-915abba59f59767d341bb190de5bba5ae03097d0.tar.gz tinderbox-cluster-915abba59f59767d341bb190de5bba5ae03097d0.tar.bz2 tinderbox-cluster-915abba59f59767d341bb190de5bba5ae03097d0.zip |
Add build log sammary
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-rw-r--r-- | buildbot_gentoo_ci/config/buildfactorys.py | 2 | ||||
-rw-r--r-- | buildbot_gentoo_ci/steps/logs.py | 35 |
2 files changed, 30 insertions, 7 deletions
diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py index d8db8f8..6e8baf6 100644 --- a/buildbot_gentoo_ci/config/buildfactorys.py +++ b/buildbot_gentoo_ci/config/buildfactorys.py @@ -177,7 +177,7 @@ def parse_build_log(): # set it SUCCESS/FAILURE/WARNINGS f.addStep(logs.MakeIssue()) # add sum log to buildbot log - #f.addStep(logs.setBuildbotLog) + f.addStep(logs.setBuildbotLog()) # set BuildStatus f.addStep(logs.setBuildStatus()) # setup things for the irc bot diff --git a/buildbot_gentoo_ci/steps/logs.py b/buildbot_gentoo_ci/steps/logs.py index 5fe248f..767fdd4 100644 --- a/buildbot_gentoo_ci/steps/logs.py +++ b/buildbot_gentoo_ci/steps/logs.py @@ -175,7 +175,7 @@ class ParserBuildLog(BuildStep): print(self.summery_dict) # remove all lines with ignore in the dict # setProperty summery_dict - self.setProperty("summery_log_dict", self.summery_dict, 'summery_log_dict') + self.setProperty("summary_log_dict", self.summery_dict, 'summary_log_dict') return SUCCESS class MakeIssue(BuildStep): @@ -193,27 +193,50 @@ class MakeIssue(BuildStep): #@defer.inlineCallbacks def run(self): self.gentooci = self.master.namedServices['services'].namedServices['gentooci'] - summery_log_dict = self.getProperty('summery_log_dict') + summary_log_dict = self.getProperty('summary_log_dict') error = False warning = False - self.summery_log_list = [] + self.summary_log_list = [] log_hash = hashlib.sha256() - for k, v in sorted(summery_log_dict.items()): + for k, v in sorted(summary_log_dict.items()): if v['status'] == 'error': error = True if v['status'] == 'warning': warning = True - self.summery_log_list.append(v['text']) + self.summary_log_list.append(v['text']) log_hash.update(v['text'].encode('utf-8')) # add build log # add issue/bug/pr report - self.setProperty("summery_log_list", self.summery_log_list, 'summery_log_list') + self.setProperty("summary_log_list", self.summary_log_list, 'summary_log_list') if error: self.setProperty("status", 'failed', 'status') if warning: self.setProperty("status", 'warning', 'status') return SUCCESS +class setBuildbotLog(BuildStep): + + name = 'setBuildbotLog' + description = 'Running' + descriptionDone = 'Ran' + descriptionSuffix = None + haltOnFailure = False + flunkOnFailure = True + warnOnWarnings = True + + def __init__(self, **kwargs): + super().__init__(**kwargs) + + @defer.inlineCallbacks + def run(self): + #setup the log + log = yield self.addLog('summary') + # add line for line + for line in self.getProperty('summary_log_list'): + yield log.addStdout(line + '\n') + # add emerge info log + return SUCCESS + class setBuildStatus(BuildStep): name = 'setBuildStatus' |