diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-29 13:49:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-07 10:56:32 +0000 |
| commit | 31f0c5e59c7fb0ae0915de584fbfcf3d95bbb061 (patch) | |
| tree | 9b313f6cab4752e2d328dc40dbd8b729ac61eb55 | |
| parent | fd07da4d46a8167807f6ce872497fbdc812494ad (diff) | |
| download | openembedded-core-contrib-31f0c5e59c7fb0ae0915de584fbfcf3d95bbb061.tar.gz | |
testsdk: Improvements to the json logging
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/testsdk.bbclass | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 66170e3377..6981d40be1 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -14,29 +14,29 @@ # # 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 + from oeqa.utils.metadata import get_layers configuration = {'TEST_TYPE': test_type, - 'PROCESS_ID': pid, - 'SDK_MACHINE': d.getVar("SDKMACHINE"), + 'MACHINE': d.getVar("MACHINE"), + 'SDKMACHINE': 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)) + 'STARTTIME': d.getVar("DATETIME"), + 'HOST_DISTRO': ('-'.join(platform.linux_distribution())).replace(' ', '-'), + 'LAYERS': get_layers(d.getVar("BBLAYERS"))} return configuration +get_sdk_configuration[vardepsexclude] = "DATETIME" -def _get_sdk_json_result_dir(d): - json_result_dir = os.path.join(d.getVar("WORKDIR"), 'oeqa') +def get_sdk_json_result_dir(d): + json_result_dir = os.path.join(d.getVar("LOG_DIR"), '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 get_sdk_result_id(configuration): + return '%s_%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], configuration['SDKMACHINE'], configuration['MACHINE'], configuration['STARTTIME']) def testsdk_main(d): import os @@ -93,10 +93,10 @@ def testsdk_main(d): component = "%s %s" % (pn, OESDKTestContextExecutor.name) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) - configuration = _get_sdk_configuration(d, 'sdk', os.getpid()) - result.logDetails(_get_sdk_json_result_dir(d), + configuration = get_sdk_configuration(d, 'sdk') + result.logDetails(get_sdk_json_result_dir(d), configuration, - _get_sdk_result_id(configuration)) + get_sdk_result_id(configuration)) result.logSummary(component, context_msg) if not result.wasSuccessful(): @@ -198,10 +198,10 @@ def testsdkext_main(d): component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) - configuration = _get_sdk_configuration(d, 'sdkext', os.getpid()) - result.logDetails(_get_sdk_json_result_dir(d), + configuration = get_sdk_configuration(d, 'sdkext') + result.logDetails(get_sdk_json_result_dir(d), configuration, - _get_sdk_result_id(configuration)) + get_sdk_result_id(configuration)) result.logSummary(component, context_msg) if not result.wasSuccessful(): |