summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-08-12 14:11:16 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-25 23:03:47 +0100
commit96e8337830149f43abfe34a41269dbf10cd055a2 (patch)
tree661af5c0d180c243e335e61e96bcc888a8a5c4ca
parent8335422b001713a7137e9cfdc0870138b120da8e (diff)
downloadopenembedded-core-contrib-96e8337830149f43abfe34a41269dbf10cd055a2.tar.gz
openembedded-core-contrib-96e8337830149f43abfe34a41269dbf10cd055a2.tar.bz2
openembedded-core-contrib-96e8337830149f43abfe34a41269dbf10cd055a2.zip
oe-build-perf-test: implement --commit-results-branch
A new command line option for defining the branch where results are commited. The value is actually a format string accepting two field names: - {git_branch} expands to the name of the target branch being tested - {tester_host} expands to the hostname of the tester machine The option has no effect if --commit-results is not used. (From OE-Core rev: b54b63395ec632748a57a702812c8a9a07af35ab) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/buildperf/base.py5
-rwxr-xr-xscripts/oe-build-perf-test6
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 8f7d88cd42..119e6edf18 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -193,6 +193,11 @@ class BuildPerfTestResult(unittest.TextTestResult):
repo = GitRepo(repo_path, is_topdir=True)
if not branch:
branch = self.git_branch
+ else:
+ # Replace keywords
+ branch = branch.format(git_branch=self.git_branch,
+ tester_host=self.hostname)
+
log.info("Committing test results into %s %s", repo_path, branch)
tmp_index = os.path.join(repo_path, '.git', 'index.oe-build-perf')
try:
diff --git a/scripts/oe-build-perf-test b/scripts/oe-build-perf-test
index d6ea5ce685..390e4c9519 100755
--- a/scripts/oe-build-perf-test
+++ b/scripts/oe-build-perf-test
@@ -112,6 +112,9 @@ def parse_args(argv):
parser.add_argument('--commit-results', metavar='GIT_DIR',
type=os.path.abspath,
help="Commit result data to a (local) git repository")
+ parser.add_argument('--commit-results-branch', metavar='BRANCH',
+ default="{git_branch}",
+ help="Commit results to branch BRANCH.")
return parser.parse_args(argv)
@@ -162,7 +165,8 @@ def main(argv=None):
if args.globalres_file:
result.update_globalres_file(args.globalres_file)
if args.commit_results:
- result.git_commit_results(args.commit_results)
+ result.git_commit_results(args.commit_results,
+ args.commit_results_branch)
return 0
return 1