Merge lp:~cjohnston/qa-dashboard/respect-publish into lp:qa-dashboard

[Chris Johnston]

Update bootspeed to only display published data

[lp:~cjohnston/qa-dashboard/respect-publish]

729. By Chris Johnston on 2014-03-18

Same for views

[Joe Talbott (joetalbott)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:729
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/313/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/313/rebuild

review: Approve (continuous-integration)

=== modified file 'bootspeed/api.py'
--- bootspeed/api.py	2013-05-18 00:08:36 +0000
+++ bootspeed/api.py	2014-03-18 17:44:04 +0000
@@ -36,7 +36,11 @@
 def overall(request, arch):
     # do some reversed sorting to get the latest images.
     images = reversed(
-        Image.objects.filter(arch=arch, image_type='daily').order_by(
+        Image.objects.filter(
+            arch=arch,
+            image_type='daily',
+            publish=True,
+        ).order_by(
             '-build_number')[:MAX_RESULTS]
     )
 
@@ -85,7 +89,9 @@
     res = ImageMachineAgg.objects.filter(
         machine=machine_id,
         image__arch=arch,
-        image__image_type='daily'
+        image__image_type='daily',
+        image__publish=True,
+        publish=True,
     ).order_by(
         'image__build_number'
     )[:MAX_RESULTS]
@@ -94,6 +100,8 @@
         machine=machine_id,
         image__arch=arch,
         image__image_type='release',
+        image__publish=True,
+        publish=True,
     ).order_by(
         '-image__build_number'
     )
@@ -134,12 +142,16 @@
         machine=machine_id,
         image__arch=arch,
         image__image_type='daily',
+        image__publish=True,
+        publish=True,
     ).order_by('image__build_number')[:MAX_RESULTS]
 
     last_releases = ImageMachineAgg.objects.filter(
         machine=machine_id,
         image__arch=arch,
         image__image_type='release',
+        image__publish=True,
+        publish=True,
     ).order_by('-image__build_number')
 
     if last_releases.count() > 0:
@@ -227,13 +239,13 @@
         return JSONResponse(json.dumps(error_data))
 
     machine = machines[0]
-    image = Image.objects.filter(md5=md5)
+    image = Image.objects.filter(md5=md5, publish=True)
 
     if image.count() != 1:
         error_data['message'] = "unknown md5: {}".format(md5)
         return JSONResponse(json.dumps(error_data))
 
-    image_results = image.imageresult_set.filter(machine=machine)
+    image_results = image.imageresult_set.filter(machine=machine, publish=True)
 
     data = json.dumps({
         "image_id": image.id,

=== modified file 'bootspeed/views.py'
--- bootspeed/views.py	2014-01-07 01:42:37 +0000
+++ bootspeed/views.py	2014-03-18 17:44:04 +0000
@@ -69,7 +69,7 @@
 
 @require_GET
 def overview(request, release=None):
-    images = Image.objects.all()
+    images = Image.objects.filter(publish=True)
     releases = _get_bootspeed_releases()
 
     if release is not None:
@@ -94,7 +94,11 @@
     if arch is None:
         return redirect('arch/amd64/')
 
-    result = ImageResult.objects.filter(image__arch=arch).distinct(
+    result = ImageResult.objects.filter(
+        image__arch=arch,
+        image__publish=True,
+        publish=True,
+    ).distinct(
         'machine__name'
     )
     arches = _get_bootspeed_arches()
@@ -154,6 +158,8 @@
     qs = ImageResult.objects.filter(
         machine__id=machine_id,
         image__arch=arch,
+        image__publish=True,
+        publish=True,
     ).prefetch_related(
         'image',
         'machine',
@@ -204,7 +210,7 @@
 def image_bugs_overview(request):
     images = JobImage.objects.annotate(
         imagebuild_count=models.Count(
-            'imagebuild'
+            'imagebuild',
         )
     ).filter(imagebuild_count__gt=0).order_by(
         '-build_number',