diff options
| author | Joshua Watt <jpewhacker@gmail.com> | 2019-04-18 21:57:17 -0500 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2019-05-17 21:53:50 -0700 |
| commit | 3e48404afe27c93fa6ffbd8d66bc52dcd6216005 (patch) | |
| tree | e696798c646b594f4f39bd6686de5670ba2e9043 /scripts/lib/resulttool/merge.py | |
| parent | 3dae8d5a02c29523dc640bee31a362f46ffde6ca (diff) | |
| download | openembedded-core-3e48404afe27c93fa6ffbd8d66bc52dcd6216005.tar.gz openembedded-core-3e48404afe27c93fa6ffbd8d66bc52dcd6216005.tar.bz2 openembedded-core-3e48404afe27c93fa6ffbd8d66bc52dcd6216005.zip | |
resulttool: Load results from URL
Adds support for resulttool to load JSON files directly from a http://
or https:// URL
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'scripts/lib/resulttool/merge.py')
| -rw-r--r-- | scripts/lib/resulttool/merge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/resulttool/merge.py b/scripts/lib/resulttool/merge.py index 3e4b7a38ad..7159463f6e 100644 --- a/scripts/lib/resulttool/merge.py +++ b/scripts/lib/resulttool/merge.py @@ -17,7 +17,7 @@ import json import resulttool.resultutils as resultutils def merge(args, logger): - if os.path.isdir(args.target_results): + if resultutils.is_url(args.target_results) or os.path.isdir(args.target_results): results = resultutils.load_resultsdata(args.target_results, configmap=resultutils.store_map) resultutils.append_resultsdata(results, args.base_results, configmap=resultutils.store_map) resultutils.save_resultsdata(results, args.target_results) @@ -31,12 +31,12 @@ def merge(args, logger): def register_commands(subparsers): """Register subcommands from this plugin""" - parser_build = subparsers.add_parser('merge', help='merge test result files/directories', - description='merge the results from multiple files/directories into the target file or directory', + parser_build = subparsers.add_parser('merge', help='merge test result files/directories/URLs', + description='merge the results from multiple files/directories/URLs into the target file or directory', group='setup') parser_build.set_defaults(func=merge) parser_build.add_argument('base_results', - help='the results file/directory to import') + help='the results file/directory/URL to import') parser_build.add_argument('target_results', help='the target file or directory to merge the base_results with') |