diff options
| -rw-r--r-- | meta/lib/oeqa/buildperf/base.py | 35 | ||||
| -rwxr-xr-x | scripts/oe-build-perf-test | 5 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 0e77aae07b..8f7d88cd42 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -188,6 +188,41 @@ class BuildPerfTestResult(unittest.TextTestResult): fobj.write(','.join(values) + '\n') + def git_commit_results(self, repo_path, branch=None): + """Commit results into a Git repository""" + repo = GitRepo(repo_path, is_topdir=True) + if not branch: + branch = self.git_branch + log.info("Committing test results into %s %s", repo_path, branch) + tmp_index = os.path.join(repo_path, '.git', 'index.oe-build-perf') + try: + # Create new commit object from the new results + env_update = {'GIT_INDEX_FILE': tmp_index, + 'GIT_WORK_TREE': self.out_dir} + repo.run_cmd('add .', env_update) + tree = repo.run_cmd('write-tree', env_update) + parent = repo.rev_parse(branch) + msg = "Results of {}:{}\n".format(self.git_branch, self.git_commit) + git_cmd = ['commit-tree', tree, '-m', msg] + if parent: + git_cmd += ['-p', parent] + commit = repo.run_cmd(git_cmd, env_update) + + # Update branch head + git_cmd = ['update-ref', 'refs/heads/' + branch, commit] + if parent: + git_cmd.append(parent) + repo.run_cmd(git_cmd) + + # Update current HEAD, if we're on branch 'branch' + if repo.get_current_branch() == branch: + log.info("Updating %s HEAD to latest commit", repo_path) + repo.run_cmd('reset --hard') + finally: + if os.path.exists(tmp_index): + os.unlink(tmp_index) + + class BuildPerfTestCase(unittest.TestCase): """Base class for build performance tests""" SYSRES = 'sysres' diff --git a/scripts/oe-build-perf-test b/scripts/oe-build-perf-test index 21759c6786..d6ea5ce685 100755 --- a/scripts/oe-build-perf-test +++ b/scripts/oe-build-perf-test @@ -109,6 +109,9 @@ def parse_args(argv): help="Output directory for test results") parser.add_argument('--run-tests', nargs='+', metavar='TEST', help="List of tests to run") + parser.add_argument('--commit-results', metavar='GIT_DIR', + type=os.path.abspath, + help="Commit result data to a (local) git repository") return parser.parse_args(argv) @@ -158,6 +161,8 @@ def main(argv=None): if result.wasSuccessful(): if args.globalres_file: result.update_globalres_file(args.globalres_file) + if args.commit_results: + result.git_commit_results(args.commit_results) return 0 return 1 |