diff options
-rw-r--r-- | meta/classes/testsdk.bbclass | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index d3f475d22be..a6c362723f3 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -14,6 +14,30 @@ # # where "<image-name>" is an image like core-image-sato. +def _get_sdk_configuration(d, test_type, pid): + import platform + configuration = {'TEST_TYPE': test_type, + 'PROCESS_ID': pid, + 'SDK_MACHINE': d.getVar("SDKMACHINE"), + 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), + 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), + 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-')} + layers = (d.getVar("BBLAYERS") or "").split() + for l in layers: + configuration['%s_BRANCH_REV' % os.path.basename(l)] = '%s:%s' % (base_get_metadata_git_branch(l, None).strip(), + base_get_metadata_git_revision(l, None)) + return configuration + +def _get_sdk_json_result_dir(d): + json_result_dir = os.path.join(d.getVar("WORKDIR"), 'oeqa') + custom_json_result_dir = d.getVar("OEQA_JSON_RESULT_DIR") + if custom_json_result_dir: + json_result_dir = custom_json_result_dir + return json_result_dir + +def _get_sdk_result_id(configuration): + return '%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDK_MACHINE']) + def testsdk_main(d): import os import subprocess @@ -80,8 +104,10 @@ def testsdk_main(d): component = "%s %s" % (pn, OESDKTestContextExecutor.name) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) - - result.logDetails() + configuration = _get_sdk_configuration(d, 'sdk', os.getpid()) + result.logDetails(_get_sdk_json_result_dir(d), + configuration, + _get_sdk_result_id(configuration)) result.logSummary(component, context_msg) if not result.wasSuccessful(): @@ -184,8 +210,10 @@ def testsdkext_main(d): component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) - - result.logDetails() + configuration = _get_sdk_configuration(d, 'sdkext', os.getpid()) + result.logDetails(_get_sdk_json_result_dir(d), + configuration, + _get_sdk_result_id(configuration)) result.logSummary(component, context_msg) if not result.wasSuccessful(): |