Ubuntu CI Dashboard

Merge lp:~cjohnston/qa-dashboard/smoke-artifact-admin into lp:qa-dashboard

  1. smoke-artifact-admin
  2. Merge into dev
Proposed by Chris Johnston
Status: Work in progress
Proposed branch: lp:~cjohnston/qa-dashboard/smoke-artifact-admin
Merge into: lp:qa-dashboard
Diff against target: 62 lines (+24/-0)
2 files modified
smokeng/admin.py (+17/-0)
smokeng/models.py (+7/-0)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/smoke-artifact-admin
Reviewer Review Type Date Requested Status
QA Dashboard Developers Pending
Review via email: mp+180454@code.launchpad.net

Commit message

Add 'smoke only' artifacts using common.models Artifact

To post a comment you must log in.

Unmerged revisions

576. By Chris Johnston

Add 'smoke only' artifacts using common.models Artifact

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'smokeng/admin.py'
2--- smokeng/admin.py 2013-07-10 16:56:19 +0000
3+++ smokeng/admin.py 2013-08-16 01:08:11 +0000
4@@ -13,11 +13,14 @@
5 # You should have received a copy of the GNU Affero General Public License
6 # along with this program. If not, see <http://www.gnu.org/licenses/>.
7
8+from common.models import Artifact
9+
10 from smokeng.models import (
11 SmokeImage,
12 SmokeResult,
13 SmokeResultBug,
14 SmokeTestResult,
15+ SmokeArtifact,
16 )
17
18 from django.contrib import admin
19@@ -59,7 +62,21 @@
20 list_display = ('result', 'testcase', 'returncode')
21 ordering = ['result']
22
23+
24+class SmokeArtifactAdmin(admin.ModelAdmin):
25+ list_display = ('name', 'jenkins_build', 'publish')
26+ search_fields = ['name', 'jenkins_build']
27+
28+ def queryset(self, request):
29+ results = SmokeResult.objects.all().values('jenkins_build')
30+ builds = []
31+ for result in results:
32+ builds.append(result['jenkins_build'])
33+ artifacts = SmokeArtifact.objects.filter(jenkins_build__in=builds)
34+ return artifacts
35+
36 admin.site.register(SmokeImage, SmokeImageAdmin)
37 admin.site.register(SmokeResult, SmokeResultAdmin)
38 admin.site.register(SmokeResultBug, SmokeResultBugAdmin)
39 admin.site.register(SmokeTestResult, SmokeTestResultAdmin)
40+admin.site.register(SmokeArtifact, SmokeArtifactAdmin)
41
42=== modified file 'smokeng/models.py'
43--- smokeng/models.py 2013-07-30 21:05:41 +0000
44+++ smokeng/models.py 2013-08-16 01:08:11 +0000
45@@ -19,6 +19,7 @@
46 DashboardBaseModel,
47 Bug,
48 JenkinsBuild,
49+ Artifact,
50 )
51
52
53@@ -164,3 +165,9 @@
54 returncode = models.IntegerField()
55 stderr = models.TextField(null=True)
56 stdout = models.TextField(null=True)
57+
58+
59+class SmokeArtifact(Artifact):
60+ class Meta:
61+ proxy = True
62+ app_label = 'smokeng'

Subscribers

People subscribed via source and target branches