summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-07-11 14:56:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-21 09:26:13 +0100
commit485b328430dcdfd0b52f09f01ebd490d09459ea3 (patch)
tree79e8be88655711e18377fb9d657cbb1c69cb7161
parenteef7a1a3eb0365da5ed2bc9688203fba3b6a61b5 (diff)
downloadbitbake-contrib-485b328430dcdfd0b52f09f01ebd490d09459ea3.tar.gz
bitbake-contrib-485b328430dcdfd0b52f09f01ebd490d09459ea3.tar.bz2
bitbake-contrib-485b328430dcdfd0b52f09f01ebd490d09459ea3.zip
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] Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/toaster/orm/models.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 630e4a0003..e9182c56e7 100644
--- a/lib/toaster/orm/models.py
+++ b/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):
"""