| Message ID | GV1PR07MB91207447D621EE3962C6802EA8DD2@GV1PR07MB9120.eurprd07.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | testexport: fallback for empty IMAGE_LINK_NAME | expand |
On Wed, 2024-07-03 at 04:47 +0000, Konrad Weihmann via lists.openembedded.org wrote: > if IMAGE_LINK_NAME is set empty to disable the symlinking > for image artifacts in deploy, testexport fails, as the path assembly > is incorrect. > In that case fallback to IMAGE_NAME > > Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> > --- > meta/classes-recipe/testexport.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Are you using the test export code? There has been discussion about removing that which is why I ask... Cheers, Richard
On 04.07.24 17:15, Richard Purdie wrote: > On Wed, 2024-07-03 at 04:47 +0000, Konrad Weihmann via > lists.openembedded.org wrote: >> if IMAGE_LINK_NAME is set empty to disable the symlinking >> for image artifacts in deploy, testexport fails, as the path assembly >> is incorrect. >> In that case fallback to IMAGE_NAME >> >> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> >> --- >> meta/classes-recipe/testexport.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Are you using the test export code? There has been discussion about > removing that which is why I ask... Yes! An integral part of our testing at work. We are using a slighly patched version, which I still haven't found the time to contribute back. But we are running on LTS only, so it's fine if there's no one to maintain it, then we will need to adjust 2028 latest - worst case, I will move the class code to one of our layers, if the support in core vanishes. > > Cheers, > > Richard
On Fri, 2024-07-05 at 07:18 +0200, Konrad Weihmann wrote: > > > On 04.07.24 17:15, Richard Purdie wrote: > > On Wed, 2024-07-03 at 04:47 +0000, Konrad Weihmann via > > lists.openembedded.org wrote: > > > if IMAGE_LINK_NAME is set empty to disable the symlinking > > > for image artifacts in deploy, testexport fails, as the path > > > assembly > > > is incorrect. > > > In that case fallback to IMAGE_NAME > > > > > > Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> > > > --- > > > meta/classes-recipe/testexport.bbclass | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Are you using the test export code? There has been discussion about > > removing that which is why I ask... > > Yes! An integral part of our testing at work. > We are using a slighly patched version, which I still haven't found > the > time to contribute back. > > But we are running on LTS only, so it's fine if there's no one to > maintain it, then we will need to adjust 2028 latest - worst case, I > will move the class code to one of our layers, if the support in core > vanishes. I'd just caution that if it were removed, it would be to simplify the test code itself so it would be more than just the class unfortunately. I suspect it would be hard to maintain standalone. Cheers, Richard
diff --git a/meta/classes-recipe/testexport.bbclass b/meta/classes-recipe/testexport.bbclass index 572f5d9e76..57f7f15885 100644 --- a/meta/classes-recipe/testexport.bbclass +++ b/meta/classes-recipe/testexport.bbclass @@ -50,7 +50,7 @@ def testexport_main(d): from oeqa.runtime.context import OERuntimeTestContextExecutor image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), - d.getVar('IMAGE_LINK_NAME'))) + d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME'))) tdname = "%s.testdata.json" % image_name td = json.load(open(tdname, "r"))
if IMAGE_LINK_NAME is set empty to disable the symlinking for image artifacts in deploy, testexport fails, as the path assembly is incorrect. In that case fallback to IMAGE_NAME Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> --- meta/classes-recipe/testexport.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)