openstack/tripleo-common
Code Issues Proposed changes

Merge "Enhance error messages when building containers"

Browse Source
This commit is contained in:
Zuul 2020-05-19 20:32:18 +00:00 committed by Gerrit Code Review
commit c5b0b44d68
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleo_common/image/builder/buildah.py
View File

@ -205,12 +205,23 @@ class BuildahBuilder(base.BaseBuilder):
# failed a SystemError will be raised using the # failed a SystemError will be raised using the
# exception information. If any job was loaded # exception information. If any job was loaded
# but not executed a SystemError will be raised. # but not executed a SystemError will be raised.
exceptions = list()
for job in done: for job in done:
if job._exception: if job._exception:
raise SystemError("%(container)s raised %(exception)s" % exceptions.append(
{'container': future_to_build[job], "\nException information: {exception}".format(
'exception': job._exception}) exception=job._exception
)
)
else: else:
if exceptions:
raise RuntimeError(
'\nThe following errors were detected during '
'container build(s):\n{exceptions}'.format(
exceptions='\n'.join(exceptions)
)
)
if not_done: if not_done:
error_msg = ('The following jobs were ' error_msg = ('The following jobs were '
'incomplete: {}'.format( 'incomplete: {}'.format(

2
tripleo_common/tests/image/builder/test_buildah.py
View File

@ -185,7 +185,7 @@ class TestBuildahBuilder(base.TestCase):
mock_submit.side_effect = R_FAILED_LIST mock_submit.side_effect = R_FAILED_LIST
_b = bb(WORK_DIR, DEPS) _b = bb(WORK_DIR, DEPS)
self.assertRaises( self.assertRaises(
SystemError, RuntimeError,
_b.build_all, _b.build_all,
deps=BUILD_ALL_LIST_CONTAINERS deps=BUILD_ALL_LIST_CONTAINERS
) )