mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

resulttool: Load results from URL

Browse Source 
Adds support for resulttool to load JSON files directly from a http://
or https:// URL

(From OE-Core rev: 235bcf0c504e7ea253ccfb28d600898117c64c1f)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2019-04-18 21:57:17 -05:00
committed by Richard Purdie
parent 0ab0dacc1a
commit 3326a902db
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/resulttool/merge.py
View File

@@ -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')