summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2016-02-03 23:47:23 +0100
committerMagnus Granberg <zorry@gentoo.org>2016-02-03 23:47:23 +0100
commitc89b5d183a329b65306d22d6e994d5cbd0d00353 (patch)
tree45f653ef34a989c879412c1fadb68a3e01b669fe /python/templates
parentadd buildinfo to packages (diff)
downloadtinderbox-cluster-www-c89b5d183a329b65306d22d6e994d5cbd0d00353.tar.gz
tinderbox-cluster-www-c89b5d183a329b65306d22d6e994d5cbd0d00353.tar.bz2
tinderbox-cluster-www-c89b5d183a329b65306d22d6e994d5cbd0d00353.zip
update buildinfo to packages
Diffstat (limited to 'python/templates')
-rw-r--r--python/templates/includes/frontpage/new_logs24
-rw-r--r--python/templates/pages/packages/ebuilds/ebuild/index.html4
-rw-r--r--python/templates/pages/packages/ebuilds/index.html12
3 files changed, 24 insertions, 16 deletions
diff --git a/python/templates/includes/frontpage/new_logs b/python/templates/includes/frontpage/new_logs
index a1dd4d2..3b0310c 100644
--- a/python/templates/includes/frontpage/new_logs
+++ b/python/templates/includes/frontpage/new_logs
@@ -6,19 +6,19 @@
<td><p title="{{ B.SummeryText }}">{{ B.SummeryText|truncatewords:3 }}</p>
<td class="text-right">
{% if B.Fail %}
- {% for BE in B.BE_tmp %}
- {% if BE.BuildLogId.BuildLogId == B.BuildLogId %}
- {% if BE.ErrorId.ErrorId == 1 or BE.ErrorId.ErrorId == 2 %}
- <span class="label label-warning">{{ BE.ErrorId.ErrorName|upper }}</span>
- {% elif BE.ErrorId.ErrorId == 3 %}
- <span class="label label-info">OTHERS</span>
- {% else %}
- <span class="label label-danger">{{ BE.ErrorId.ErrorName|upper }}</span>
- {% endif %}
- {% endif %}
- {% endfor %}
+ {% if B.FailCode == 'OTHERS' %}
+ <span class="label label-info">{{ B.FailCode }}</span>
+ {% else %}
+ <span class="label label-info">{{ B.FailCode }}</span>
+ {% endif %}
{% else %}
- <span class="label label-success">OK</span>
+ <span class="label label-success">Build</span>
+ {% endif %}
+ {% if B.Repoman %}
+ <span class="label label-warning">Repoman</span>
+ {% endif %}
+ {% if B.Qa %}
+ <span class="label label-warning">Qa</span>
{% endif %}
</td>
</td>
diff --git a/python/templates/pages/packages/ebuilds/ebuild/index.html b/python/templates/pages/packages/ebuilds/ebuild/index.html
index 4752be1..6f2166a 100644
--- a/python/templates/pages/packages/ebuilds/ebuild/index.html
+++ b/python/templates/pages/packages/ebuilds/ebuild/index.html
@@ -48,12 +48,12 @@
{% endif %}
{% for BLR in BLR_tmp %}
{% if BLR.BuildLogId.BuildLogId == BL.BuildLogId%}
- <span class="label label-danger">Repoman</span>
+ <span class="label label-warning">Repoman</span>
{% endif %}
{% endfor %}
{% for BLQ in BLQ_tmp %}
{% if BLQ.BuildLogId.BuildLogId == BL.BuildLogId%}
- <span class="label label-danger">Qa</span>
+ <span class="label label-warning">Qa</span>
{% endif %}
{% endfor %}
<a class="btn btn-default btn-xs" href="/new/logs/build/{{ BL.BuildLogId }}/">More info</a>
diff --git a/python/templates/pages/packages/ebuilds/index.html b/python/templates/pages/packages/ebuilds/index.html
index a9cef7d..0107d0b 100644
--- a/python/templates/pages/packages/ebuilds/index.html
+++ b/python/templates/pages/packages/ebuilds/index.html
@@ -13,8 +13,16 @@
<td>
{% for FI in fi_tmp %}
{% if FI.EbuildId == E.EbuildId.EbuildId %}
- {% if FI.qa %}<span class="label label-warning">Qa</span>{% endif %}
- {% if FI.repoman %}<span class="label label-warning">Repoman</span>{% endif %}
+ {% if FI.qa %}
+ <span class="label label-warning">Qa</span>
+ {% else %}
+ <span class="label label-success">Qa</span>
+ {% endif %}
+ {% if FI.repoman %}
+ <span class="label label-warning">Repoman</span>
+ {% else %}
+ <span class="label label-success">Repoman</span>
+ {% endif %}
{% if FI.fail %}
<span class="label label-danger">Build</span>
{% else %}