diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-16 18:13:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-24 16:53:05 +0000 |
commit | b4513e75f746a0989b09ee53cb85e489d41e5783 (patch) | |
tree | 707bf879c20f741e94de7f54bc43f45079b63595 /scripts/lib/resulttool/resultsutils.py | |
parent | 07054cc2691fd2822028a3fd55185af457f79ebf (diff) | |
download | openembedded-core-b4513e75f746a0989b09ee53cb85e489d41e5783.tar.gz openembedded-core-b4513e75f746a0989b09ee53cb85e489d41e5783.tar.bz2 openembedded-core-b4513e75f746a0989b09ee53cb85e489d41e5783.zip |
resulttool: Improvements to allow integration to the autobuilder
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/resulttool/resultsutils.py')
-rw-r--r-- | scripts/lib/resulttool/resultsutils.py | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/scripts/lib/resulttool/resultsutils.py b/scripts/lib/resulttool/resultsutils.py deleted file mode 100644 index 368786922c..0000000000 --- a/scripts/lib/resulttool/resultsutils.py +++ /dev/null @@ -1,67 +0,0 @@ -# test result tool - utilities -# -# Copyright (c) 2019, Intel Corporation. -# -# 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 os -import json -import scriptpath -scriptpath.add_oe_lib_path() -from oeqa.utils.git import GitRepo, GitError - -def load_json_file(file): - with open(file, "r") as f: - return json.load(f) - -def dump_json_data(write_dir, file_name, json_data): - file_content = json.dumps(json_data, sort_keys=True, indent=4) - file_path = os.path.join(write_dir, file_name) - with open(file_path, 'w') as the_file: - the_file.write(file_content) - -def get_dict_value(logger, dict, key): - try: - return dict[key] - except KeyError: - if logger: - logger.debug('Faced KeyError exception: dict=%s: key=%s' % (dict, key)) - return None - except TypeError: - if logger: - logger.debug('Faced TypeError exception: dict=%s: key=%s' % (dict, key)) - return None - -def pop_dict_element(logger, dict, key): - try: - dict.pop(key) - except KeyError: - if logger: - logger.debug('Faced KeyError exception: dict=%s: key=%s' % (dict, key)) - except AttributeError: - if logger: - logger.debug('Faced AttributeError exception: dict=%s: key=%s' % (dict, key)) - -def checkout_git_dir(git_dir, git_branch): - try: - repo = GitRepo(git_dir, is_topdir=True) - repo.run_cmd('checkout %s' % git_branch) - return True - except GitError: - return False - -def get_directory_files(source_dir, excludes, file): - files_in_dir = [] - for root, dirs, files in os.walk(source_dir, topdown=True): - [dirs.remove(d) for d in list(dirs) if d in excludes] - for name in files: - if name == file: - files_in_dir.append(os.path.join(root, name)) - return files_in_dir
\ No newline at end of file |