mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: include setscene in task progress

Browse Source 
Change the task progress counting from the task order field
which excludes setscene to the task completion field which
counts all completed tasks regardless of type.

[YOCTO #9971]

(Bitbake rev: 485b328430dcdfd0b52f09f01ebd490d09459ea3)

Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
David Reyna
2017-07-11 14:56:08 -07:00
committed by Richard Purdie
parent b4f0266716
commit 36568b9e1e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/orm/models.py
+4 -3
View File
@@ -508,7 +508,7 @@ class Build(models.Model):
tf = Task.objects.filter(build = self) tf = Task.objects.filter(build = self)
tfc = tf.count() tfc = tf.count()
if tfc > 0: if tfc > 0:
completeper = tf.exclude(order__isnull=True).count()*100 // tfc completeper = tf.exclude(outcome=Task.OUTCOME_NA).count()*100 // tfc
else: else:
completeper = 0 completeper = 0
return completeper return completeper
@@ -709,10 +709,11 @@ class Build(models.Model):
tasks. tasks.
Note that the mechanism for testing whether a Task is "done" is whether Note that the mechanism for testing whether a Task is "done" is whether
its order field is set, as per the completeper() method. its outcome field is set, as per the completeper() method.
""" """
return self.outcome == Build.IN_PROGRESS and \ return self.outcome == Build.IN_PROGRESS and \
self.task_build.filter(order__isnull=False).count() == 0 self.task_build.exclude(outcome=Task.OUTCOME_NA).count() == 0
def get_state(self): def get_state(self):
""" """