mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
47eb3d00e9
This is a combined patch of the various tweaks and improvements I made to resulttool: * Avoid subprocess.run() as its a python 3.6 feature and we have autobuilder workers with 3.5. * Avoid python keywords as variable names * Simplify dict accesses using .get() * Rename resultsutils -> resultutils to match the resultstool -> resulttool rename * Formalised the handling of "file_name" to "TESTSERIES" which the code will now add into the json configuration data if its not present, based on the directory name. * When we don't have failed test cases, print something saying so instead of an empty table * Tweak the table headers in the report to be more readable (reference "Test Series" instead if file_id and ID instead of results_id) * Improve/simplify the max string length handling * Merge the counts and percentage data into one table in the report since printing two reports of the same data confuses the user * Removed the confusing header in the regression report * Show matches, then regressions, then unmatched runs in the regression report, also remove chatting unneeded output * Try harder to "pair" up matching configurations to reduce noise in the regressions report * Abstracted the "mapping" table concept used to pairing in the regression code to general code in resultutils * Created multiple mappings for results analysis, results storage and 'flattening' results data in a merge * Simplify the merge command to take a source and a destination, letting the destination be a directory or a file, removing the need for an output directory parameter * Add the 'IMAGE_PKGTYPE' and 'DISTRO' config options to the regression mappings * Have the store command place the testresults files in a layout from the mapping, making commits into the git repo for results storage more useful for simple comparison purposes * Set the oe-git-archive tag format appropriately for oeqa results storage (and simplify the commit messages closer to their defaults) * Fix oe-git-archive to use the commit/branch data from the results file * Cleaned up the command option help to match other changes * Follow the model of git branch/tag processing used by oe-build-perf-report and use that to read the data using git show to avoid branch change * Add ptest summary to the report command * Update the tests to match the above changes (From OE-Core rev: ff2c029b568f70aa9960dde04ddd207829812ea0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
93 lines
4.0 KiB
Python
93 lines
4.0 KiB
Python
# resulttool - store test results
|
|
#
|
|
# Copyright (c) 2019, Intel Corporation.
|
|
# Copyright (c) 2019, Linux Foundation
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify it
|
|
# under the terms and conditions of the GNU General Public License,
|
|
# version 2, as published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
# more details.
|
|
#
|
|
import tempfile
|
|
import os
|
|
import subprocess
|
|
import json
|
|
import shutil
|
|
import scriptpath
|
|
scriptpath.add_bitbake_lib_path()
|
|
scriptpath.add_oe_lib_path()
|
|
import resulttool.resultutils as resultutils
|
|
import oeqa.utils.gitarchive as gitarchive
|
|
|
|
|
|
def store(args, logger):
|
|
tempdir = tempfile.mkdtemp(prefix='testresults.')
|
|
try:
|
|
results = {}
|
|
logger.info('Reading files from %s' % args.source)
|
|
for root, dirs, files in os.walk(args.source):
|
|
for name in files:
|
|
f = os.path.join(root, name)
|
|
if name == "testresults.json":
|
|
resultutils.append_resultsdata(results, f)
|
|
elif args.all:
|
|
dst = f.replace(args.source, tempdir + "/")
|
|
os.makedirs(os.path.dirname(dst), exist_ok=True)
|
|
shutil.copyfile(f, dst)
|
|
resultutils.save_resultsdata(results, tempdir)
|
|
|
|
if not results and not args.all:
|
|
if args.allow_empty:
|
|
logger.info("No results found to store")
|
|
return 0
|
|
logger.error("No results found to store")
|
|
return 1
|
|
|
|
keywords = {'branch': None, 'commit': None, 'commit_count': None}
|
|
|
|
# Find the branch/commit/commit_count and ensure they all match
|
|
for suite in results:
|
|
for result in results[suite]:
|
|
config = results[suite][result]['configuration']['LAYERS']['meta']
|
|
for k in keywords:
|
|
if keywords[k] is None:
|
|
keywords[k] = config.get(k)
|
|
if config.get(k) != keywords[k]:
|
|
logger.error("Mismatched source commit/branch/count: %s vs %s" % (config.get(k), keywords[k]))
|
|
return 1
|
|
|
|
logger.info('Storing test result into git repository %s' % args.git_dir)
|
|
|
|
gitarchive.gitarchive(tempdir, args.git_dir, False, False,
|
|
"Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}",
|
|
False, "{branch}/{commit_count}-g{commit}/{tag_number}",
|
|
'Test run #{tag_number} of {branch}:{commit}', '',
|
|
[], [], False, keywords, logger)
|
|
|
|
finally:
|
|
subprocess.check_call(["rm", "-rf", tempdir])
|
|
|
|
return 0
|
|
|
|
def register_commands(subparsers):
|
|
"""Register subcommands from this plugin"""
|
|
parser_build = subparsers.add_parser('store', help='store test results into a git repository',
|
|
description='takes a results file or directory of results files and stores '
|
|
'them into the destination git repository, splitting out the results '
|
|
'files as configured',
|
|
group='setup')
|
|
parser_build.set_defaults(func=store)
|
|
parser_build.add_argument('source',
|
|
help='source file or directory that contain the test result files to be stored')
|
|
parser_build.add_argument('git_dir',
|
|
help='the location of the git repository to store the results in')
|
|
parser_build.add_argument('-a', '--all', action='store_true',
|
|
help='include all files, not just testresults.json files')
|
|
parser_build.add_argument('-e', '--allow-empty', action='store_true',
|
|
help='don\'t error if no results to store are found')
|
|
|