From: David Reyna <David.Reyna@windriver.com>
Date: Tue, 11 Jul 2017 21:56:08 +0000 (-0700)
Subject: bitbake: toaster: include setscene in task progress
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36568b9e1e079f55a6d2e7bad0fd3ca27c90bb53;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: toaster: include setscene in task progress

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>
---

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 630e4a00031..e9182c56e74 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -508,7 +508,7 @@ class Build(models.Model):
         tf = Task.objects.filter(build = self)
         tfc = tf.count()
         if tfc > 0:
-            completeper = tf.exclude(order__isnull=True).count()*100 // tfc
+            completeper = tf.exclude(outcome=Task.OUTCOME_NA).count()*100 // tfc
         else:
             completeper = 0
         return completeper
@@ -709,10 +709,11 @@ class Build(models.Model):
         tasks.
 
         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 \
-            self.task_build.filter(order__isnull=False).count() == 0
+            self.task_build.exclude(outcome=Task.OUTCOME_NA).count() == 0
+
 
     def get_state(self):
         """