From 731a0ac2c8ee7f09c24e30b01ac6e3aeaeb1fd08 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 14 Jan 2014 12:35:12 +0000 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldviewer/templates/simple_task.html | 8 ++++++-- bitbake/lib/toaster/bldviewer/views.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster/bldviewer') 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 @@ {% if task.task_executed %} Executed {% else %} - Prebuilt + Not Executed {% endif %} {{task.sstate_checksum}} - {{task.get_outcome_display}}{% if task.provider %}
(by {{task.provider.recipe.name}}.{{task.provider.task_name}}){% endif %} + {{task.get_outcome_display}}{% if task.provider %}
(by {{task.provider.recipe.name}}.{{task.provider.task_name}}){% endif %} + {% if task.outcome == task.OUTCOME_CACHED %}{% for t in task.get_related_setscene %} +
({{t.task_name}} {{t.get_outcome_display}}) + {% endfor %}{%endif%} +

{{task.message}} {{task.elapsed_time}} {{task.cpu_usage}} 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): def task(request, build_id): template = 'simple_task.html' - tasks = _build_page_range(Paginator(Task.objects.filter(build=build_id), 100),request.GET.get('page', 1)) + tasks = _build_page_range(Paginator(Task.objects.filter(build=build_id, order__gt=0), 100),request.GET.get('page', 1)) for t in tasks: if t.outcome == Task.OUTCOME_COVERED: -- cgit v1.2.3-54-g00ecf