mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

testsdk: Improvements to the json logging

Browse Source 
Tweak the preceeding commit to:
* Add STARTTIME to the identifier to make it unique
* Add MACHINE to the identifier
* Use LOG_DIR
* Store the layer config in a more natural json format
* Drop '_' function prefixes

(From OE-Core rev: c272079d662237b1b9f87940c88cbadaeda9a9d1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-10-29 13:49:24 +00:00
parent fc16be1787
commit 1fd2d4acfc
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/testsdk.bbclass
+18 -18
View File
@@ -14,29 +14,29 @@
# #
# where "<image-name>" is an image like core-image-sato. # where "<image-name>" is an image like core-image-sato.
def _get_sdk_configuration(d, test_type, pid): def get_sdk_configuration(d, test_type):
import platform import platform
from oeqa.utils.metadata import get_layers
configuration = {'TEST_TYPE': test_type, configuration = {'TEST_TYPE': test_type,
'PROCESS_ID': pid, 'MACHINE': d.getVar("MACHINE"),
'SDK_MACHINE': d.getVar("SDKMACHINE"), 'SDKMACHINE': d.getVar("SDKMACHINE"),
'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"), 'IMAGE_BASENAME': d.getVar("IMAGE_BASENAME"),
'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"), 'IMAGE_PKGTYPE': d.getVar("IMAGE_PKGTYPE"),
'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-')} 'STARTTIME': d.getVar("DATETIME"),
layers = (d.getVar("BBLAYERS") or "").split() 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'),
for l in layers: 'LAYERS': get_layers(d.getVar("BBLAYERS"))}
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 return configuration
get_sdk_configuration[vardepsexclude] = "DATETIME"
def _get_sdk_json_result_dir(d): def get_sdk_json_result_dir(d):
json_result_dir = os.path.join(d.getVar("WORKDIR"), 'oeqa') json_result_dir = os.path.join(d.getVar("LOG_DIR"), 'oeqa')
custom_json_result_dir = d.getVar("OEQA_JSON_RESULT_DIR") custom_json_result_dir = d.getVar("OEQA_JSON_RESULT_DIR")
if custom_json_result_dir: if custom_json_result_dir:
json_result_dir = custom_json_result_dir json_result_dir = custom_json_result_dir
return json_result_dir return json_result_dir
def _get_sdk_result_id(configuration): def get_sdk_result_id(configuration):
return '%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDK_MACHINE']) return '%s_%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDKMACHINE'], configuration['MACHINE'], configuration['STARTTIME'])
def testsdk_main(d): def testsdk_main(d):
import os import os
@@ -104,10 +104,10 @@ def testsdk_main(d):
component = "%s %s" % (pn, OESDKTestContextExecutor.name) component = "%s %s" % (pn, OESDKTestContextExecutor.name)
context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env))
configuration = _get_sdk_configuration(d, 'sdk', os.getpid()) configuration = get_sdk_configuration(d, 'sdk')
result.logDetails(_get_sdk_json_result_dir(d), result.logDetails(get_sdk_json_result_dir(d),
configuration, configuration,
_get_sdk_result_id(configuration)) get_sdk_result_id(configuration))
result.logSummary(component, context_msg) result.logSummary(component, context_msg)
if not result.wasSuccessful(): if not result.wasSuccessful():
@@ -210,10 +210,10 @@ def testsdkext_main(d):
component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) component = "%s %s" % (pn, OESDKExtTestContextExecutor.name)
context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env))
configuration = _get_sdk_configuration(d, 'sdkext', os.getpid()) configuration = get_sdk_configuration(d, 'sdkext')
result.logDetails(_get_sdk_json_result_dir(d), result.logDetails(get_sdk_json_result_dir(d),
configuration, configuration,
_get_sdk_result_id(configuration)) get_sdk_result_id(configuration))
result.logSummary(component, context_msg) result.logSummary(component, context_msg)
if not result.wasSuccessful(): if not result.wasSuccessful():