From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DFB2158094 for ; Wed, 6 Jul 2022 18:44:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BB12E0CE3; Wed, 6 Jul 2022 18:44:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F817E0CE3 for ; Wed, 6 Jul 2022 18:44:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B1B7341814 for ; Wed, 6 Jul 2022 18:44:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB360480 for ; Wed, 6 Jul 2022 18:44:36 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1657133048.86dae64f04e20bf74405496289564cd993429c03.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: buildbot_gentoo_ci/steps/bugs.py buildbot_gentoo_ci/steps/logs.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 86dae64f04e20bf74405496289564cd993429c03 X-VCS-Branch: master Date: Wed, 6 Jul 2022 18:44:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 06609c16-a9a8-46a1-b560-e58592a940fd X-Archives-Hash: 00a78285f5fb0b0a68053db946b7f0be commit: 86dae64f04e20bf74405496289564cd993429c03 Author: Magnus Granberg gentoo org> AuthorDate: Wed Jul 6 18:44:08 2022 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Wed Jul 6 18:44:08 2022 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=86dae64f Change title_issue and title_phase Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/bugs.py | 2 +- buildbot_gentoo_ci/steps/logs.py | 29 +++-------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/buildbot_gentoo_ci/steps/bugs.py b/buildbot_gentoo_ci/steps/bugs.py index e43c926..27b1388 100644 --- a/buildbot_gentoo_ci/steps/bugs.py +++ b/buildbot_gentoo_ci/steps/bugs.py @@ -88,7 +88,7 @@ class GetBugs(BuildStep): match = False for bug in buglist: yield log.addStdout('Bug: ' + str(bug['id']) + ' Summary: ' + bug['summary'] +'\n') - if re.search(self.getProperty('error_dict')['title_phase'][:20], bug['summary']): + if re.search(self.getProperty('error_dict')['title_issue'][:20], bug['summary']): print('Bug found') print(bug) match = {} diff --git a/buildbot_gentoo_ci/steps/logs.py b/buildbot_gentoo_ci/steps/logs.py index 7a63658..e5e61a5 100644 --- a/buildbot_gentoo_ci/steps/logs.py +++ b/buildbot_gentoo_ci/steps/logs.py @@ -318,39 +318,16 @@ class MakeIssue(BuildStep): text_phase_list = [] for k, v in sorted(self.summary_log_dict.items()): # get the issue error - if v['text'].startswith(' * ERROR:') and v['text'].endswith(' phase):'): - issue_text = self.summary_log_dict[k + 1]['text'] - if issue_text.startswith(' * ninja -v -j'): - issue_text = 'ninja failed' - if issue_text.startswith(' * (no error'): - issue_text = False - if issue_text: - text_issue_list.append(issue_text) - # get the phase error if v['type'] == self.error_dict['phase'] and v['status'] == 'error': - text_phase_list.append(v['text']) - # if not get the first issue - if text_issue_list == []: - for k, v in self.summary_log_dict.items(): - if v['type'] == 'issues': - text_issue_list.append(v['text']) - # if not get the first error - if text_phase_list == []: - for k, v in self.summary_log_dict.items(): - if v['status'] == 'error': - text_phase_list.append(v['text']) + text_issue_list.append(v['text']) # add the issue error if text_issue_list != []: self.error_dict['title_issue'] = text_issue_list[0].replace('*', '').strip() else: self.error_dict['title_issue'] = 'title_issue : None' - # add the error line - if text_phase_list != []: - self.error_dict['title_phase'] = text_phase_list[0].replace('*', '').strip() - else: - self.error_dict['title_phase'] = 'title_phase : None' + self.error_dict['title_phase'] = 'failed in '+ self.error_dict['phase'] #set the error title - self.error_dict['title'] = self.error_dict['title_issue'] + ' (' + self.error_dict['title_phase'] + ')' + self.error_dict['title'] = self.error_dict['title_phase'] + ' - ' + self.error_dict['title_issue'] @defer.inlineCallbacks def run(self):