MIRRORS/yocto-autobuilder-helper
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder-helper.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

utils: Move getcomparisonbranch() to common function library

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2019-02-21 14:26:56 +00:00
parent e1564ff86c
commit 5130ab9f21
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/build-perf-test-wrapper
View File

@ -23,6 +23,8 @@ import subprocess
import sys import sys
import datetime import datetime
import utils
parser = utils.ArgParser(description='Run a build performance test and process the results.') parser = utils.ArgParser(description='Run a build performance test and process the results.')
parser.add_argument('-b', '--branch', parser.add_argument('-b', '--branch',
@ -159,24 +161,6 @@ if args.publish_dir:
os.makedirs(args.publish_dir, exist_ok=True) os.makedirs(args.publish_dir, exist_ok=True)
subprocess.check_call("cp -r %s/* %s" % (results_tmpdir, args.publish_dir), shell=True) subprocess.check_call("cp -r %s/* %s" % (results_tmpdir, args.publish_dir), shell=True)
#
# Figure out which branch we might need to compare against
#
def getcomparisionbranch(ourconfig, reponame, branchname):
print("Working off %s:%s\n" % (reponame, branchname))
base = None
basebranch = None
if "/" in reponame:
reponame = reponame.rsplit("/", 1)[1]
if reponame.endswith(".git"):
reponame = reponame[:-4]
if (reponame + ":" + branchname) in utils.getconfig("BUILD_HISTORY_FORKPUSH", ourconfig):
base = utils.getconfig("BUILD_HISTORY_FORKPUSH", ourconfig)[reponame + ":" + branchname]
if base:
baserepo, basebranch = base.split(":")
print("Comparing to %s\n" % (basebranch))
return basebranch
# Commit results to git # Commit results to git
if git_repo: if git_repo:
print("\nArchiving results in " + git_repo) print("\nArchiving results in " + git_repo)
@ -198,7 +182,7 @@ if git_repo:
extraopts = " --branch %s --commit %s" % (branch, gitrevfull) extraopts = " --branch %s --commit %s" % (branch, gitrevfull)
if args.repo and args.branch: if args.repo and args.branch:
comparebranch = getcomparisionbranch(ourconfig, args.repo, args.branch) comparebranch = utils.getcomparisonbranch(ourconfig, args.repo, args.branch)
if comparebranch: if comparebranch:
extraopts = extraopts + " --branch2 %s" % (comparebranch) extraopts = extraopts + " --branch2 %s" % (comparebranch)

18
scripts/utils.py
View File

@ -344,3 +344,21 @@ class ArgParser(argparse.ArgumentParser):
sys.stderr.write('error: %s\n' % message) sys.stderr.write('error: %s\n' % message)
self.print_help() self.print_help()
sys.exit(2) sys.exit(2)
#
# Figure out which branch we might need to compare against
#
def getcomparisonbranch(ourconfig, reponame, branchname):
print("Working off %s:%s\n" % (reponame, branchname))
base = None
basebranch = None
if "/" in reponame:
reponame = reponame.rsplit("/", 1)[1]
if reponame.endswith(".git"):
reponame = reponame[:-4]
if (reponame + ":" + branchname) in getconfig("BUILD_HISTORY_FORKPUSH", ourconfig):
base = getconfig("BUILD_HISTORY_FORKPUSH", ourconfig)[reponame + ":" + branchname]
if base:
baserepo, basebranch = base.split(":")
print("Comparing to %s\n" % (basebranch))
return basebranch