From 504f20398641e53f7193bbfefb1eff5f2d459fe6 Mon Sep 17 00:00:00 2001 From: Konrad Weihmann <kweihmann@outlook.com> Date: Sat, 21 Sep 2024 10:04:44 +0000 Subject: [PATCH] testexport: fallback for empty IMAGE_LINK_NAME 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 (From OE-Core rev: 0c1d098e6dd08fa3a5aafca656457ac6badcef89) (From OE-Core rev: a821a5810ae6edba5882a43e3c60c142f2acda9d) Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com> --- meta/classes/testexport.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 1b0fb44a4a8..deb68ec6ced 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/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")) -- GitLab