mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

resulttool: Handle ltp rawlogs as well as ptest

Browse Source 
Improve the rawlogs handling to include ltp logs as well as the ptest ones to
reduce the size of the results git repos.

(From OE-Core rev: a0a1954d559609c2c1ca16936d0d68eb3c4c6b45)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-11-22 16:14:37 +00:00
parent 589bd28e46
commit 33a2d01430
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/resulttool/resultutils.py
+20 -13
View File
@@ -14,8 +14,11 @@ import scriptpath
import copy import copy
import urllib.request import urllib.request
import posixpath import posixpath
import logging
scriptpath.add_oe_lib_path() scriptpath.add_oe_lib_path()
logger = logging.getLogger('resulttool')
flatten_map = { flatten_map = {
"oeselftest": [], "oeselftest": [],
"runtime": [], "runtime": [],
@@ -38,6 +41,12 @@ store_map = {
"manual": ['TEST_TYPE', 'TEST_MODULE', 'MACHINE', 'IMAGE_BASENAME'] "manual": ['TEST_TYPE', 'TEST_MODULE', 'MACHINE', 'IMAGE_BASENAME']
} }
rawlog_sections = {
"ptestresult.rawlogs": "ptest",
"ltpresult.rawlogs": "ltp",
"ltpposixresult.rawlogs": "ltpposix"
}
def is_url(p): def is_url(p):
""" """
Helper for determining if the given path is a URL Helper for determining if the given path is a URL
@@ -108,15 +117,14 @@ def filter_resultsdata(results, resultid):
newresults[r][i] = results[r][i] newresults[r][i] = results[r][i]
return newresults return newresults
def strip_ptestresults(results): def strip_logs(results):
newresults = copy.deepcopy(results) newresults = copy.deepcopy(results)
#for a in newresults2:
# newresults = newresults2[a]
for res in newresults: for res in newresults:
if 'result' not in newresults[res]: if 'result' not in newresults[res]:
continue continue
if 'ptestresult.rawlogs' in newresults[res]['result']: for logtype in rawlog_sections:
del newresults[res]['result']['ptestresult.rawlogs'] if logtype in newresults[res]['result']:
del newresults[res]['result'][logtype]
if 'ptestresult.sections' in newresults[res]['result']: if 'ptestresult.sections' in newresults[res]['result']:
for i in newresults[res]['result']['ptestresult.sections']: for i in newresults[res]['result']['ptestresult.sections']:
if 'log' in newresults[res]['result']['ptestresult.sections'][i]: if 'log' in newresults[res]['result']['ptestresult.sections'][i]:
@@ -155,9 +163,6 @@ def generic_get_rawlogs(sectname, results):
return None return None
return decode_log(results[sectname]['log']) return decode_log(results[sectname]['log'])
def ptestresult_get_rawlogs(results):
return generic_get_rawlogs('ptestresult.rawlogs', results)
def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False): def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False):
for res in results: for res in results:
if res: if res:
@@ -167,16 +172,18 @@ def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, p
os.makedirs(os.path.dirname(dst), exist_ok=True) os.makedirs(os.path.dirname(dst), exist_ok=True)
resultsout = results[res] resultsout = results[res]
if not ptestjson: if not ptestjson:
resultsout = strip_ptestresults(results[res]) resultsout = strip_logs(results[res])
with open(dst, 'w') as f: with open(dst, 'w') as f:
f.write(json.dumps(resultsout, sort_keys=True, indent=1)) f.write(json.dumps(resultsout, sort_keys=True, indent=1))
for res2 in results[res]: for res2 in results[res]:
if ptestlogs and 'result' in results[res][res2]: if ptestlogs and 'result' in results[res][res2]:
seriesresults = results[res][res2]['result'] seriesresults = results[res][res2]['result']
rawlogs = ptestresult_get_rawlogs(seriesresults) for logtype in rawlog_sections:
if rawlogs is not None: logdata = generic_get_rawlogs(logtype, seriesresults)
with open(dst.replace(fn, "ptest-raw.log"), "w+") as f: if logdata is not None:
f.write(rawlogs) logger.info("Extracting " + rawlog_sections[logtype] + "-raw.log")
with open(dst.replace(fn, rawlog_sections[logtype] + "-raw.log"), "w+") as f:
f.write(logdata)
if 'ptestresult.sections' in seriesresults: if 'ptestresult.sections' in seriesresults:
for i in seriesresults['ptestresult.sections']: for i in seriesresults['ptestresult.sections']:
sectionlog = ptestresult_get_log(seriesresults, i) sectionlog = ptestresult_get_log(seriesresults, i)