diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-08-12 14:11:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-25 23:03:47 +0100 |
commit | 96e8337830149f43abfe34a41269dbf10cd055a2 (patch) | |
tree | 661af5c0d180c243e335e61e96bcc888a8a5c4ca | |
parent | 8335422b001713a7137e9cfdc0870138b120da8e (diff) | |
download | poky-96e8337830149f43abfe34a41269dbf10cd055a2.tar.gz |
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.py | 5 | ||||
-rwxr-xr-x | scripts/oe-build-perf-test | 6 |
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): | |||
193 | repo = GitRepo(repo_path, is_topdir=True) | 193 | repo = GitRepo(repo_path, is_topdir=True) |
194 | if not branch: | 194 | if not branch: |
195 | branch = self.git_branch | 195 | branch = self.git_branch |
196 | else: | ||
197 | # Replace keywords | ||
198 | branch = branch.format(git_branch=self.git_branch, | ||
199 | tester_host=self.hostname) | ||
200 | |||
196 | log.info("Committing test results into %s %s", repo_path, branch) | 201 | log.info("Committing test results into %s %s", repo_path, branch) |
197 | tmp_index = os.path.join(repo_path, '.git', 'index.oe-build-perf') | 202 | tmp_index = os.path.join(repo_path, '.git', 'index.oe-build-perf') |
198 | try: | 203 | 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): | |||
112 | parser.add_argument('--commit-results', metavar='GIT_DIR', | 112 | parser.add_argument('--commit-results', metavar='GIT_DIR', |
113 | type=os.path.abspath, | 113 | type=os.path.abspath, |
114 | help="Commit result data to a (local) git repository") | 114 | help="Commit result data to a (local) git repository") |
115 | parser.add_argument('--commit-results-branch', metavar='BRANCH', | ||
116 | default="{git_branch}", | ||
117 | help="Commit results to branch BRANCH.") | ||
115 | 118 | ||
116 | return parser.parse_args(argv) | 119 | return parser.parse_args(argv) |
117 | 120 | ||
@@ -162,7 +165,8 @@ def main(argv=None): | |||
162 | if args.globalres_file: | 165 | if args.globalres_file: |
163 | result.update_globalres_file(args.globalres_file) | 166 | result.update_globalres_file(args.globalres_file) |
164 | if args.commit_results: | 167 | if args.commit_results: |
165 | result.git_commit_results(args.commit_results) | 168 | result.git_commit_results(args.commit_results, |
169 | args.commit_results_branch) | ||
166 | return 0 | 170 | return 0 |
167 | 171 | ||
168 | return 1 | 172 | return 1 |