diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-01-14 12:35:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-27 21:01:03 +0000 |
commit | 731a0ac2c8ee7f09c24e30b01ac6e3aeaeb1fd08 (patch) | |
tree | 95e31f60da5a68d5c2032296ce4450f8c6d9f8db /bitbake/lib/toaster/bldviewer | |
parent | 3e1dbed33822dd949336022bc155cc5435719b38 (diff) | |
download | poky-731a0ac2c8ee7f09c24e30b01ac6e3aeaeb1fd08.tar.gz |
bitbake: toaster: update Task classification fields
This patch updates the task classification fields (outcome, etc)
as to
* Changes outcome names from SSTATE to CACHED and
from EXISTING to PREBUILT
* NoExec tasks now recorded as Not Executed / script type NA instead
of Executed / script type NOEXEC. Script type NOEXEC is deleted.
* SetScene tasks do not get order numbers
* New task method that returns a QuerySet for setscene tasks related
to this task: Task.get_related_setscene()
* New custom TaskManager that allows searching for setscene tasks
related to a certain task: Task.objects.related_setscene(task)
(Bitbake rev: a4164821a142f8b625a5fdc209adc6dc80874241)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldviewer')
-rw-r--r-- | bitbake/lib/toaster/bldviewer/templates/simple_task.html | 8 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldviewer/views.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_task.html b/bitbake/lib/toaster/bldviewer/templates/simple_task.html index cb6f309fef..a5ed5295ea 100644 --- a/bitbake/lib/toaster/bldviewer/templates/simple_task.html +++ b/bitbake/lib/toaster/bldviewer/templates/simple_task.html | |||
@@ -33,11 +33,15 @@ | |||
33 | {% if task.task_executed %} | 33 | {% if task.task_executed %} |
34 | <td>Executed</td> | 34 | <td>Executed</td> |
35 | {% else %} | 35 | {% else %} |
36 | <td>Prebuilt</td> | 36 | <td>Not Executed</td> |
37 | {% endif %} | 37 | {% endif %} |
38 | 38 | ||
39 | <td>{{task.sstate_checksum}}</td> | 39 | <td>{{task.sstate_checksum}}</td> |
40 | <td>{{task.get_outcome_display}}{% if task.provider %}</br>(by <a href="#{{task.provider.recipe.name}}.{{task.provider.task_name}}">{{task.provider.recipe.name}}.{{task.provider.task_name}}</a>){% endif %}</td> | 40 | <td>{{task.get_outcome_display}}{% if task.provider %}</br>(by <a href="#{{task.provider.recipe.name}}.{{task.provider.task_name}}">{{task.provider.recipe.name}}.{{task.provider.task_name}}</a>){% endif %} |
41 | {% if task.outcome == task.OUTCOME_CACHED %}{% for t in task.get_related_setscene %} | ||
42 | <br/>({{t.task_name}} {{t.get_outcome_display}}) | ||
43 | {% endfor %}{%endif%} | ||
44 | </td> | ||
41 | <td><p>{{task.message}}</td> | 45 | <td><p>{{task.message}}</td> |
42 | <td>{{task.elapsed_time}}</td> | 46 | <td>{{task.elapsed_time}}</td> |
43 | <td>{{task.cpu_usage}}</td> | 47 | <td>{{task.cpu_usage}}</td> |
diff --git a/bitbake/lib/toaster/bldviewer/views.py b/bitbake/lib/toaster/bldviewer/views.py index 22b42d39ce..6a90ed7b5a 100644 --- a/bitbake/lib/toaster/bldviewer/views.py +++ b/bitbake/lib/toaster/bldviewer/views.py | |||
@@ -84,7 +84,7 @@ def _find_task_provider(task): | |||
84 | def task(request, build_id): | 84 | def task(request, build_id): |
85 | template = 'simple_task.html' | 85 | template = 'simple_task.html' |
86 | 86 | ||
87 | tasks = _build_page_range(Paginator(Task.objects.filter(build=build_id), 100),request.GET.get('page', 1)) | 87 | tasks = _build_page_range(Paginator(Task.objects.filter(build=build_id, order__gt=0), 100),request.GET.get('page', 1)) |
88 | 88 | ||
89 | for t in tasks: | 89 | for t in tasks: |
90 | if t.outcome == Task.OUTCOME_COVERED: | 90 | if t.outcome == Task.OUTCOME_COVERED: |