scripts/oe-build-perf-report: Avoid buildstats warning

When a comparision branch is set we see warnings. If two branches are used,
look for buildstats information from both to avoid this kind of warning:

INFO: Parsing buildstats from 'refs/notes/buildstats/perf-centos7.yoctoproject.org/master-next/qemux86'
WARNING: Buildstats not found for perf-centos7.yoctoproject.org/master/qemux86/56808-g08220028e52992dcba667fc97bf3afe8be1949fb/0
WARNING: Buildstats not found for perf-centos7.yoctoproject.org/master/qemux86/56808-g08220028e52992dcba667fc97bf3afe8be1949fb/1
INFO: Buildstats were missing for some test runs, please run 'git fetch origin refs/notes/buildstats/perf-centos7.yoctoproject.org/master-next/qemux86:refs/notes/buildstats/perf-centos7.yoctoproject.org/master-next/qemux86' and try again

(the warning is due to stats being looked for in both branches, choose
the other branch and different warnings would be shown)

(From OE-Core rev: af58c18fcd0451540dd77ee862956b2b9dee17c4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-01-11 16:10:43 +00:00
parent 3a83fec814
commit de6f1393e9

View File

@ -372,7 +372,7 @@ def print_html_report(data, id_comp, buildstats):
chart_opts=chart_opts))
def get_buildstats(repo, notes_ref, revs, outdir=None):
def get_buildstats(repo, notes_ref, notes_ref2, revs, outdir=None):
"""Get the buildstats from git notes"""
full_ref = 'refs/notes/' + notes_ref
if not repo.rev_parse(full_ref):
@ -391,8 +391,13 @@ def get_buildstats(repo, notes_ref, revs, outdir=None):
for tag in rev.tags:
log.debug(' %s', tag)
try:
bs_all = json.loads(repo.run_cmd(['notes', '--ref', notes_ref,
'show', tag + '^0']))
try:
bs_all = json.loads(repo.run_cmd(['notes', '--ref', notes_ref, 'show', tag + '^0']))
except GitError:
if notes_ref2:
bs_all = json.loads(repo.run_cmd(['notes', '--ref', notes_ref2, 'show', tag + '^0']))
else:
raise
except GitError:
log.warning("Buildstats not found for %s", tag)
bs_all = {}
@ -589,9 +594,12 @@ def main(argv=None):
buildstats = None
if args.dump_buildstats or args.html:
outdir = 'oe-build-perf-buildstats' if args.dump_buildstats else None
notes_ref = 'buildstats/{}/{}/{}'.format(args.hostname, args.branch,
args.machine)
buildstats = get_buildstats(repo, notes_ref, [rev_l, rev_r], outdir)
notes_ref = 'buildstats/{}/{}/{}'.format(args.hostname, args.branch, args.machine)
notes_ref2 = None
if args.branch2:
notes_ref = 'buildstats/{}/{}/{}'.format(args.hostname, args.branch2, args.machine)
notes_ref2 = 'buildstats/{}/{}/{}'.format(args.hostname, args.branch, args.machine)
buildstats = get_buildstats(repo, notes_ref, notes_ref2, [rev_l, rev_r], outdir)
# Print report
if not args.html: