On Wed, 2024-01-24 at 15:29 +0100, Alexis Lothoré via lists.openembedded.org wrote: > From: Alexis Lothoré <[email protected]> > > TESTIMAGE_FAILED_QA_ARTIFACTS currently sets a default list of files to be > saved whenever some tests fail. Unfortunately, this default value is very > easily discarded, because TESTIMAGE_FAILED_QA_ARTIFACTS is expected to be > enriched by some core recipes (example: ptest images) which are often > parsed before testimage.bbclass. Those core recipes could still manage to > get the default value AND add some files by using override syntax, but then > it makes it difficult for downstream recipes or bbappend files to tune this > variable. > > Allow to set this default value and make sure it is not overwritten by > recipes wanting to tune it, by setting the default value in > core-image-minimal. > While doing so, set it as a default value instead of a weak default value. > > Signed-off-by: Alexis Lothoré <[email protected]> > --- > meta/classes-recipe/testimage.bbclass | 9 --------- > meta/recipes-core/images/core-image-minimal.bb | 8 ++++++++ > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/meta/classes-recipe/testimage.bbclass > b/meta/classes-recipe/testimage.bbclass > index f36d9418914f..cfda5b631ba8 100644 > --- a/meta/classes-recipe/testimage.bbclass > +++ b/meta/classes-recipe/testimage.bbclass > @@ -18,15 +18,6 @@ inherit image-artifact-names > > TESTIMAGE_AUTO ??= "0" > > -# When any test fails, TESTIMAGE_FAILED_QA ARTIFACTS will be parsed and for > -# each entry in it, if artifact pointed by path description exists on target, > -# it will be retrieved onto host > - > -TESTIMAGE_FAILED_QA_ARTIFACTS ??= "\ > - ${localstatedir}/log \ > - ${sysconfdir}/version \ > - ${sysconfdir}/os-release" > - > # You can set (or append to) TEST_SUITES in local.conf to select the tests > # which you want to run for your target. > # The test names are the module names in meta/lib/oeqa/runtime/cases. > diff --git a/meta/recipes-core/images/core-image-minimal.bb > b/meta/recipes-core/images/core-image-minimal.bb > index 84343adcd8e2..8f5fb0d2ae51 100644 > --- a/meta/recipes-core/images/core-image-minimal.bb > +++ b/meta/recipes-core/images/core-image-minimal.bb > @@ -10,3 +10,11 @@ inherit core-image > > IMAGE_ROOTFS_SIZE ?= "8192" > IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", > "systemd", " + 4096", "", d)}" > + > +# When any test fails, TESTIMAGE_FAILED_QA ARTIFACTS will be parsed and for > +# each entry in it, if artifact pointed by path description exists on target, > +# it will be retrieved onto host > +TESTIMAGE_FAILED_QA_ARTIFACTS ?= "\ > + ${localstatedir}/log \ > + ${sysconfdir}/version \ > + ${sysconfdir}/os-release" > \ No newline at end of file
I'm a little puzzled by this. Doesn't this mean it won't work for any image that isn't based upon minimal (which is most of them)? Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#194293): https://lists.openembedded.org/g/openembedded-core/message/194293 Mute This Topic: https://lists.openembedded.org/mt/103932521/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
