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

yocto_conole_view: Ensure unresolved changes are deleted when we resolve

Browse Source 
This should stop the UI looking as confused as builds resolve the build
revisions.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-09-10 11:13:16 +01:00
parent ad5baf5ce1
commit bda30c6f4f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yocto_console_view/src/module/main.module.coffee
View File

@ -274,6 +274,11 @@ class Console extends Controller
if not change? if not change?
change = @changesBySSID[rev] change = @changesBySSID[rev]
if not change? if not change?
if buildset? and buildset.parent_buildid?
oldrev = "Unresolved #{buildset.parent_buildid}"
delete @changesBySSID.oldrev
oldrev = "Unresolved #{build.builderid}-#{build.buildid}"
delete @changesBySSID.oldrev
change = @makeFakeChange(rev, build.started_at, rev) change = @makeFakeChange(rev, build.started_at, rev)
change.caption = "Commit" change.caption = "Commit"
if build.properties?.yp_build_branch? if build.properties?.yp_build_branch?
@ -282,20 +287,21 @@ class Console extends Controller
change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + rev + "&type=commit&limit=150" change.errorlink = "http://errors.yoctoproject.org/Errors/Latest/?filter=" + rev + "&type=commit&limit=150"
if build.properties?.reason? if build.properties?.reason?
change.reason = build.properties.reason[0] change.reason = build.properties.reason[0]
else else
if buildset? and buildset.parent_buildid? if buildset? and buildset.parent_buildid?
rev = "Unresolved #{buildset.parent_buildid}" rev = "Unresolved #{buildset.parent_buildid}"
if not change? if not change?
change = @changesBySSID[rev] change = @changesBySSID[rev]
if not change? if not change?
change = @makeFakeChange("Unresolved #{buildset.parent_buildid}", build.started_at, "Unresolved #{buildset.parent_buildid}") oldrev = "Unresolved #{build.builderid}-#{build.buildid}"
delete @changesBySSID.oldrev
change = @makeFakeChange(rev, build.started_at, rev)
if not change? if not change?
rev = "Unresolved #{build.builderid}-#{build.buildid}" rev = "Unresolved #{build.builderid}-#{build.buildid}"
if not change? if not change?
change = @changesBySSID[rev] change = @changesBySSID[rev]
if not change? if not change?
change = @makeFakeChange("Unresolved #{build.builderid}-#{build.buildid}", build.started_at, "Unresolved #{build.builderid}-#{build.buildid}") change = @makeFakeChange(rev, build.started_at, rev)
change.caption = rev change.caption = rev
change.buildersById[build.builderid].builds.push(build) change.buildersById[build.builderid].builds.push(build)

2
yocto_console_view/yocto_console_view/static/scripts.js
View File

File diff suppressed because one or more lines are too long