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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74F00158042 for ; Wed, 16 Oct 2024 20:50:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B123CE0769; Wed, 16 Oct 2024 20:50:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 93B11E0769 for ; Wed, 16 Oct 2024 20:50:26 +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 99CAC342FAA for ; Wed, 16 Oct 2024 20:50:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3CA8AE7 for ; Wed, 16 Oct 2024 20:50:23 +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: <1729111804.be93016aa5c8743c88fa3cc2c6c92fc7a9d53593.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/builders.py X-VCS-Directories: buildbot_gentoo_ci/steps/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: be93016aa5c8743c88fa3cc2c6c92fc7a9d53593 X-VCS-Branch: master Date: Wed, 16 Oct 2024 20:50:23 +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: a2c276b3-97c9-4c4a-8aed-308d4658f067 X-Archives-Hash: dec8070018eb8f95668d85eb03b1ef14 commit: be93016aa5c8743c88fa3cc2c6c92fc7a9d53593 Author: Magnus Granberg gentoo org> AuthorDate: Wed Oct 16 20:50:04 2024 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Wed Oct 16 20:50:04 2024 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=be93016a Use stderr_failed when stderr fail in build Signed-off-by: Magnus Granberg gentoo.org> buildbot_gentoo_ci/steps/builders.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py index 1db8cc2..7123cf4 100644 --- a/buildbot_gentoo_ci/steps/builders.py +++ b/buildbot_gentoo_ci/steps/builders.py @@ -30,6 +30,7 @@ def PersOutputOfEmerge(rc, stdout, stderr): emerge_output['circular_deps'] = False emerge_output['masked'] = False emerge_output['failed'] = False + emerge_output['stderr_failed'] = False package_dict = {} change_use = {} log_path_list = [] @@ -92,8 +93,8 @@ def PersOutputOfEmerge(rc, stdout, stderr): # split the lines #FIXME: Handling of stderr output stderr_line_list = [] - if stderr != '' and not emerge_output['failed']: - emerge_output['failed'] = True + if stderr != '': + emerge_output['stderr_failed'] = True for line in stderr.split('\n'): if 'Change USE:' in line: line_list = line.split(' ') @@ -360,8 +361,9 @@ class SetupPropertys(BuildStep): project_build_data['buildbot_build_id']) project_build_data['builder_id'] = builder_id project_build_data['buildnumber'] = self.getProperty("buildnumber") + project_build_data['bug_id'] = 0 self.setProperty('project_build_data', project_build_data, 'project_build_data') - print(self.getProperty("project_build_data")) + print(f"Project_build_data: {project_build_data}") self.masterdest = yield os.path.join(self.master.basedir, 'workers', self.getProperty('workername'), str(self.getProperty("buildnumber"))) self.setProperty('masterdest', self.masterdest, 'masterdest') self.setProperty('build_env', {}, 'build_env') @@ -919,7 +921,7 @@ class CheckEmergeLogs(BuildStep): print(emerge_output) # this should be set in the config retrays = 5 - if self.getProperty('rerun') <= retrays and emerge_output['failed']: + if self.getProperty('rerun') <= retrays and emerge_output['stderr_failed']: # when we need to change use. we could rerun pre-build with # --autounmask-use=y --autounmask-write=y --autounmask-only=y # but we use --binpkg--respect-use=y in EMERGE_DEFAULT_OPTS