commit: be93016aa5c8743c88fa3cc2c6c92fc7a9d53593
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 20:50:04 2024 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> 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 <zorry <AT> 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
