mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

image_qa: fix error handling

Browse Source 
Make ImageQAFailed inherit BBHandledException so exceptions raised in tests are
catched when the actual test function is executed by bb.utils.better_exec.

Change the do_image_qa tasks so errors are handled with oe.qa.handle_error. Add
some comment to explain this requires to list the test in ERROR_QA or WARN_QA.

[YOCTO #14807]
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14807

(From OE-Core rev: 8fe7aef17eefa70e3f7c07077b8c695e5c00ed5e)

Signed-off-by: Louis Rannou <louis.rannou@non.se.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 905e224849fbbed1719e0add231b00e2d570b3b4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Louis Rannou
2024-09-13 14:25:52 +02:00
committed by Steve Sakoman
parent cbd445e044
commit 2c09c72cf1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes-recipe/image.bbclass
View File

@@ -308,23 +308,24 @@ addtask do_image_complete_setscene
#
# The functions should use ${IMAGE_ROOTFS} to find the unpacked rootfs
# directory, which if QA passes will be the basis for the images.
#
# The functions should use oe.utils.ImageQAFailed(description, name) to raise
# errors. The name must be listed in ERROR_QA or WARN_QA to prompt.
fakeroot python do_image_qa () {
from oe.utils import ImageQAFailed
qa_cmds = (d.getVar('IMAGE_QA_COMMANDS') or '').split()
qamsg = ""
for cmd in qa_cmds:
try:
bb.build.exec_func(cmd, d)
except oe.utils.ImageQAFailed as e:
qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (e.name, e.description)
qamsg = 'Image QA function %s failed: %s\n' % (e.name, e.description)
oe.qa.handle_error(e.name, qamsg, d)
except Exception as e:
qamsg = qamsg + '\tImage QA function %s failed: %s\n' % (cmd, e)
if qamsg:
imgname = d.getVar('IMAGE_NAME')
bb.fatal("QA errors found whilst validating image: %s\n%s" % (imgname, qamsg))
oe.qa.exit_if_errors(d)
}
addtask do_image_qa after do_rootfs before do_image

2
meta/lib/oe/utils.py
View File

@@ -482,7 +482,7 @@ def get_multilib_datastore(variant, d):
localdata.setVar("MLPREFIX", "")
return localdata
class ImageQAFailed(Exception):
class ImageQAFailed(bb.BBHandledException):
def __init__(self, description, name=None, logfile=None):
self.description = description
self.name = name