From 09b099903bdf51bfb277b9a8f922255cfe83ab96 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Fri, 21 Mar 2014 05:35:50 -0700 Subject: toaster: add Image detail and multiple targets to dashboard Filled in the Image section detail information and allow for multiple targets. Each target has a separate section. Added license manifest display. Changed the target of the license manifest link. Added Tasks failed in the build summary. The target lists required filters to create sorted lists. [YOCTO #4258] [YOCTO #5936] Signed-off-by: Farrell Wymore --- .../toastergui/templates/builddashboard.html | 87 +++++++++++++++++----- 1 file changed, 67 insertions(+), 20 deletions(-) (limited to 'lib/toaster/toastergui/templates/builddashboard.html') diff --git a/lib/toaster/toastergui/templates/builddashboard.html b/lib/toaster/toastergui/templates/builddashboard.html index 763a28d1b..9d91f4031 100644 --- a/lib/toaster/toastergui/templates/builddashboard.html +++ b/lib/toaster/toastergui/templates/builddashboard.html @@ -1,15 +1,12 @@ {% extends "basebuildpage.html" %} {% load humanize %} {% load projecttags %} -{% block localbreadcrumb %} -
  • Dashboard
    • -{% endblock %} {% block buildinfomain %}
    -

    {{build.target_set.all|join:" "}} {{build.machine}}

    +

    {{build.target_set.all|join:", "}} {{build.machine}}

    @@ -17,13 +14,25 @@
    - {%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%} {{build.completed_on|date:"d/m/y H:i"}} with {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %}{% if build.errors_no %} - {{build.errors_no}} error{{build.errors_no|pluralize}} + + {%if build.outcome == build.SUCCEEDED%}Completed{%elif build.outcome == build.FAILED%}Failed{%else%}{%endif%} + + {{build.completed_on|date:"d/m/y H:i"}} + +{% if build.warnings_no or build.errors_no %} + with +{% endif %} +{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} +{% if build.errors_no %} + {{build.errors_no}} error{{build.errors_no|pluralize}} {% endif %} {% if build.warnings_no %} - {{build.warnings_no}} warning{{build.warnings_no|pluralize}} +{% if build.errors_no %} + and +{% endif %} + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} {% endif %} - Build time: {{ build.timespent|sectohms }} + Build time: {{ build.timespent|sectohms }} {%endif%}
    @@ -58,10 +67,40 @@ {%if build.outcome == build.SUCCEEDED%}
    -

    Images

    - -
    -
    + {% if hasImages %} +

    Images

    + {% for target in targets %} + {% if target.target.is_image %} +
    +

    {{target.target}} +

    +
    +
    Packages included
    +
    {{target.npkg}}
    +
    Total package size
    +
    {{target.pkgsz|filtered_filesizeformat}}
    +
    + + License manifest +
    +
    {{target.target.license_manifest_path}}
    +
    + + Image files +
    +
    +
      + {% for i in target.imageFiles %} +
    • {{i.path}} + ({{i.size|filtered_filesizeformat}})
      • + {% endfor %} +
    +
    +
    +
    + {% endif %} + {% endfor %} + {% endif %}
    {%else%} @@ -75,24 +114,32 @@

    Configuration

    Machine
    {{build.machine}}
    -
    Distro
    -
    Layers
    {% for i in build.layer_version_build.all %}
    {{i.layer.name}}
    {%endfor%} +
    Distro
    {{build.distro}}
    +
    Layers
    {% for i in build.layer_version_build.all|dictsort:"layer.name" %}
    {{i.layer.name}}
    {%endfor%}

    Tasks

    -
    Total number of tasks
    {{build.task_build.all.count}}
    -
    Tasks executed
    {% query build.task_build task_executed=1 order__gt=0 as exectask%}{{exectask.count}}
    -
    Tasks prebuilt
    {% query build.task_build task_executed=0 order__gt=0 as noexectask%}{{noexectask.count}}
    -
    Reuse
    {% query build.task_build order__gt=0 as texec %}{{noexectask.count|multiply:100|divide:texec.count}}%
    +
    Total number of tasks
    {{build.task_build.all.count}}
    +
    Tasks executed
    {% query build.task_build task_executed=1 order__gt=0 as exectask%}{{exectask.count}}
    +
    Tasks not executed
    {% query build.task_build task_executed=0 order__gt=0 as noexectask%}{{noexectask.count}}
    +
    Reuse
    +{% query build.task_build order__gt=0 as texec %} +{% if noexectask.count|multiply:100|divide:texec.count < 0 %} +0 +{% else %} +{{noexectask.count|multiply:100|divide:texec.count}} +{% endif %} +% +

    Recipes & Packages

    -
    Recipes used
    {{recipecount}}
    -
    Packages built
    {{build.package_set.all.count}}
    +
    Recipes built
    {{recipecount}}
    +
    Packages built
    {{build.package_set.all.count}}
    -- cgit 1.2.3-korg