Merge lp:~stylesen/lava-scheduler/sub-job-links into lp:lava-scheduler

Proposed by Senthil Kumaran S
Status: Superseded
Proposed branch: lp:~stylesen/lava-scheduler/sub-job-links
Merge into: lp:lava-scheduler
Prerequisite: lp:lava-scheduler/multinode
Diff against target: 41 lines (+20/-0) (has conflicts)
2 files modified
lava_scheduler_app/models.py (+9/-0)
lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html (+11/-0)
Text conflict in lava_scheduler_app/models.py
Text conflict in lava_scheduler_app/urls.py
Text conflict in lava_scheduler_app/views.py
To merge this branch: bzr merge lp:~stylesen/lava-scheduler/sub-job-links
Reviewer Review Type Date Requested Status
Linaro Automation & Validation Pending
Review via email: mp+181466@code.launchpad.net

This proposal has been superseded by a proposal from 2013-08-24.

Description of the change

List all subjobs of a multinode job.

See https://cards.linaro.org/browse/LAVA-635 for details.

To post a comment you must log in.
Revision history for this message
Neil Williams (codehelp) wrote :

Approved, thanks Senthil.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py 2013-08-22 06:02:59 +0000
+++ lava_scheduler_app/models.py 2013-08-22 06:03:00 +0000
@@ -642,6 +642,15 @@
642 "LAVA job notification: " + description, mail,642 "LAVA job notification: " + description, mail,
643 settings.SERVER_EMAIL, recipients)643 settings.SERVER_EMAIL, recipients)
644644
645 @property
646 def sub_jobs_list(self):
647 if self.target_group:
648 jobs = TestJob.objects.filter(
649 target_group=self.target_group).order_by('id')
650 return jobs
651 else:
652 return None
653
645654
646class DeviceStateTransition(models.Model):655class DeviceStateTransition(models.Model):
647 created_on = models.DateTimeField(auto_now_add=True)656 created_on = models.DateTimeField(auto_now_add=True)
648657
=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html'
--- lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html 2013-08-22 06:02:59 +0000
+++ lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html 2013-08-22 06:03:00 +0000
@@ -62,6 +62,17 @@
6262
63 <dt>Finished at:</dt>63 <dt>Finished at:</dt>
64 <dd>{{ job.end_time|default:"not finished" }}</dd>64 <dd>{{ job.end_time|default:"not finished" }}</dd>
65
66 {% if job.target_group %}
67 <dt>Sub Jobs:</dt>
68 {% for subjob in job.sub_jobs_list %}
69 <dd>
70 <a href="{% url lava.scheduler.job.detail subjob.pk %}">
71 {{ subjob.sub_id }}</a>
72 </dd>
73 {% endfor %}
74 {% endif %}
75
65</dl>76</dl>
66<h2>Views</h2>77<h2>Views</h2>
67<ul>78<ul>

Subscribers

People subscribed via source and target branches