From 5dd43ff79b3d9dd04957e0737e12d641bb1db485 Mon Sep 17 00:00:00 2001 From: xando Date: Tue, 8 Jul 2014 12:27:46 +0200 Subject: templates reorganized --- .../testrunner/templates/testrunner/base.html | 11 -- .../templates/testrunner/compare_results.html | 36 ------ .../testrunner/templates/testrunner/execute.html | 37 ------ .../templates/testrunner/jenkins_build_view.html | 92 --------------- .../templates/testrunner/jenkins_job_view.html | 124 --------------------- .../templates/testrunner/lava_job_view.html | 24 ---- .../testrunner/templates/testrunner/legend.html | 20 ---- 7 files changed, 344 deletions(-) delete mode 100644 testmanager/testrunner/templates/testrunner/base.html delete mode 100644 testmanager/testrunner/templates/testrunner/compare_results.html delete mode 100644 testmanager/testrunner/templates/testrunner/execute.html delete mode 100644 testmanager/testrunner/templates/testrunner/jenkins_build_view.html delete mode 100644 testmanager/testrunner/templates/testrunner/jenkins_job_view.html delete mode 100644 testmanager/testrunner/templates/testrunner/lava_job_view.html delete mode 100644 testmanager/testrunner/templates/testrunner/legend.html (limited to 'testmanager') diff --git a/testmanager/testrunner/templates/testrunner/base.html b/testmanager/testrunner/templates/testrunner/base.html deleted file mode 100644 index 0b69b0c..0000000 --- a/testmanager/testrunner/templates/testrunner/base.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends 'base.html' %} - -{% block js_include %} - {{ block.super }} - - -{% endblock %} - - -{% block maincontent %} -{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/compare_results.html b/testmanager/testrunner/templates/testrunner/compare_results.html deleted file mode 100644 index b9dd128..0000000 --- a/testmanager/testrunner/templates/testrunner/compare_results.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends 'testrunner/base.html' %} - -{% block maincontent %} - {% if testsets %} -
-
-
-

Comparison of: {{ testsets.0.lava_job.jenkins_build.job.name }}

-
- - - - - {% for testset in testsets %} - - {% endfor %} - - - - - {% for testcase in testcases %} - - - {% for result in testcase.results %} - - {% endfor %} - - - {% endfor %} - -
Test name{{ testset.lava_job.jenkins_build.number }} {{ testset.lava_job.device_type.name }} #{{ testset.lava_job.number }}
{{ testcase.name }}{{ result }}{% if testcase.is_different %}{% endif %}
-
-
- {% endif %} - -{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/execute.html b/testmanager/testrunner/templates/testrunner/execute.html deleted file mode 100644 index dc46c8f..0000000 --- a/testmanager/testrunner/templates/testrunner/execute.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends 'testrunner/base.html' %} - -{% block maincontent %} -
-
- -
- -
- -
- - - -
- -
- - - -
- -
- -
- -
-
-{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/jenkins_build_view.html b/testmanager/testrunner/templates/testrunner/jenkins_build_view.html deleted file mode 100644 index cddc939..0000000 --- a/testmanager/testrunner/templates/testrunner/jenkins_build_view.html +++ /dev/null @@ -1,92 +0,0 @@ -{% extends 'testrunner/base.html' %} - - -{% block maincontent %} -
-
-
- {% for build in jenkins_build %} -
-

{{ build.name }}

-

{{ build.job.name }}

-
- {% for subbuild in build.jenkinsbuild_set.all %} -
-
-

{{ subbuild.get_hwpack_name }}

-
- - - - - - - - - - - - - - - - - - - -
Build nameBuild statusBuild numberDate
{{ subbuild.name }}{{ subbuild.status.name }}{{ subbuild.number }}{{ subbuild.timestamp }}
- - -
- -
- - {% for lavajob in subbuild.lavajob_set.all %} -
-
-

- {{ lavajob.device_type.name }} - #{{ lavajob.number }} -

-
- - - - - - - - - - - - {% for testdef, testresult in lavajob.get_definitions_results %} - - - - - - - - {% endfor %} - -
Test nameTest statusPassFailCompare
{{ testdef.name }}{% if testresult %} OK {% else %} Missing {% endif %}{{ testresult.get_resultset_count_by_status.pass }}{{ testresult.get_resultset_count_by_status.fail }} - {% if testresult %} - - {% endif %} -
-
- {% endfor %} -
- {% endfor %} - {% endfor %} -
-
-
-{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/jenkins_job_view.html b/testmanager/testrunner/templates/testrunner/jenkins_job_view.html deleted file mode 100644 index e3c1d8f..0000000 --- a/testmanager/testrunner/templates/testrunner/jenkins_job_view.html +++ /dev/null @@ -1,124 +0,0 @@ -{% extends 'testrunner/base.html' %} - -{% block css_include %} -{{ block.super }} - -{% endblock %} - -{% block maincontent %} - -
-
-
-

{{ jenkins_job.name }}

-
-
-
- -
-
- {% if jenkins_job.get_umbrella_builds %} - {% for build in jenkins_job.get_umbrella_builds|slice:":10" %} -
-
- {{ build.number }} - {{ build.timestamp|date:'c' }} -
- {% if build.is_umbrella %} - - - - - - - - - - {% for subbuild in build.jenkinsbuild_set.all %} - - - - {% if subbuild.lavajob_set.all %} - - {% endif %} - - {% endfor %} - -
Build hwpackBuild status
{{ subbuild.get_hwpack_name }}{{ subbuild.status.name }} - - - - - - - - - - - {% for lavajob in subbuild.lavajob_set.all %} - - - - - - - {% endfor %} - -
LAVA jobLAVA deviceLAVA statusLAVA Results
{{ lavajob.number }}{{ lavajob.device_type.name }}{{ lavajob.status.name }}{% if lavajob.has_results_missing %} Incomplete {% else %} OK {% endif %}
-
- {% endif %} -
- {% endfor %} - {% else %} - {% for build in jenkins_builds %} -
-
- - {{ build.number }} - {{ build.timestamp|date:'c' }} - -
- - - - - - - - - - - {% if build.lavajob_set.all %} - - {% endif %} - - -
Build status
{{ build.status.name }} - - - - - - - - - - - {% for lavajob in build.lavajob_set.all %} - - - - - - - {% endfor %} - -
LAVA jobLAVA deviceLAVA statusLAVA Results
{{ lavajob.number }}{{ lavajob.device_type.name }}{{ lavajob.status.name }} - {% if lavajob.has_results_missing %} Incomplete {% else %} OK {% endif %} -
-
-
- {% endfor %} - {% endif %} -
-
- -{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/lava_job_view.html b/testmanager/testrunner/templates/testrunner/lava_job_view.html deleted file mode 100644 index e2590e0..0000000 --- a/testmanager/testrunner/templates/testrunner/lava_job_view.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'testrunner/base.html' %} - -{% block maincontent %} - {% if lava_job %} - {{ lava_job.jenkins_build.job.name }} | - {{ lava_job.jenkins_build.number }} | - {{ lava_job.number }} -
-

Jenkins build: {{ lava_job.jenkins_build.name }}

-

LAVA job: {{ lava_job.device_type.name }} ({{ lava_job.number }})

- - {% endif %} - -{% endblock %} diff --git a/testmanager/testrunner/templates/testrunner/legend.html b/testmanager/testrunner/templates/testrunner/legend.html deleted file mode 100644 index 71a572c..0000000 --- a/testmanager/testrunner/templates/testrunner/legend.html +++ /dev/null @@ -1,20 +0,0 @@ -
 
-
-
-
LAVA job statuses
-
Complete
-
Incomplete
-
Cancelled
-
Running
-
- -
-
Jenkins job statuses
-
SUCCESS
-
FAILURE
-
RUNNING
-
ABORTED
-
ERROR
-
-
-
 
-- cgit v1.2.3