Merge lp:~milo/linaro-ci-dashboard/refactor-job-schedule into lp:linaro-ci-dashboard

[Milo Casagrande]

This, as briefly discussed on a previous merge proposal, is the refactoring of the loops in order for them to really call the correct "schedule_build" method.

Previously, the overridden "schedule_build" was not call, due to the fact that the build is scheduled through a view that was created against the Loop class, and not the actual subclass. The "schedule_build" was in fact called inside the LoopBuildView class as "self.object.schedule_build()", but "self.object" was always of type "Loop", calling only its method, and not the subclass one.

The solution is to create personalized "build views" for each loop, inheriting from LoopBuildView, defining also the correct URL path and removing the "schedule_build" from inside each subclass, as long as they do not need to specialize it.

The proposed merge fixes all these.

[Stevan Radaković (stevanr)]

Tnx for taking care of this Milo.
Good code.
Approve +1

review: Approve (code)

=== modified file 'dashboard/frontend/android_build/models/android_loop.py'
--- dashboard/frontend/android_build/models/android_loop.py	2012-08-24 13:00:02 +0000
+++ dashboard/frontend/android_build/models/android_loop.py	2012-08-24 14:25:22 +0000
@@ -55,8 +55,6 @@
     DEFAULT_GCC = '4.4.0'
     DEFAULT_IMAGE_SIZE = '2G'
 
-    EXCLUDE_LIST = ['id', 'name', 'server', 'loop_ptr']
-
     # BUILD_TYPE
     build_type = models.CharField(max_length=100,
                                   choices=ANDROID_BUILD_TYPES,
@@ -127,8 +125,5 @@
             pass
 
     def schedule_build(self):
-        # Every time before the build is scheduled, update the
-        # loop config on the remote server.
         parameters = {'parameter': [{'delay': '0'}]}
-        self.server.create_or_update_loop(self)
         return super(self.__class__, self).schedule_build(parameters)

=== modified file 'dashboard/frontend/integration_loop/models/integration_loop.py'
--- dashboard/frontend/integration_loop/models/integration_loop.py	2012-08-24 13:00:02 +0000
+++ dashboard/frontend/integration_loop/models/integration_loop.py	2012-08-24 14:25:22 +0000
@@ -29,8 +29,6 @@
     precommand = models.CharField(max_length=200)
     command = models.CharField(max_length=200)
 
-    EXCLUDE_LIST = ['id', 'name', 'server', 'loop_ptr']
-
     def save(self, *args, **kwargs):
         self.server = JenkinsServer.objects.get(id=1)
         super(self.__class__, self).save(*args, **kwargs)

=== modified file 'dashboard/frontend/integration_loop/templates/integration_loop_detail.html'
--- dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-08-23 08:45:39 +0000
+++ dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-08-24 14:25:22 +0000
@@ -41,7 +41,7 @@
 {% block scripts %}
 <script type="text/javascript">
 $("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/loop/build/{{ integration_loop_detail.name }}/", function(data) {
+  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/integration_loop/build/{{ integration_loop_detail.name }}/", function(data) {
     data = $.parseJSON(data);
     $("<div/>", {
       "class": "test",

=== modified file 'dashboard/frontend/integration_loop/urls.py'
--- dashboard/frontend/integration_loop/urls.py	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/urls.py	2012-08-24 14:25:22 +0000
@@ -15,13 +15,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls.defaults import patterns, include, url
-from frontend.integration_loop.views.integration_loop_create_view\
+from django.conf.urls.defaults import patterns, url
+from frontend.integration_loop.views.integration_loop_create_view \
     import IntegrationLoopCreateView
-from frontend.integration_loop.views.integration_loop_update_view\
+from frontend.integration_loop.views.integration_loop_update_view \
     import IntegrationLoopUpdateView
-from frontend.integration_loop.views.integration_loop_detail_view\
+from frontend.integration_loop.views.integration_loop_detail_view \
     import IntegrationLoopDetailView
+from frontend.integration_loop.views.integration_loop_build_view \
+    import IntegrationLoopBuildView
 
 
 urlpatterns = patterns('',
@@ -31,4 +33,6 @@
         IntegrationLoopDetailView.as_view(), name='IntegrationLoopDetail'),
     url(r'^integration_loop/update/(?P<slug>[\w|\W]+)/$',
         IntegrationLoopUpdateView.as_view(), name='IntegrationLoopUpdate'),
+    url(r'^integration_loop/build/(?P<slug>[\w|\W]+)/$',
+        IntegrationLoopBuildView.as_view(), name='IntegrationLoopBuild'),
 )

=== added file 'dashboard/frontend/integration_loop/views/integration_loop_build_view.py'
--- dashboard/frontend/integration_loop/views/integration_loop_build_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_build_view.py	2012-08-24 14:25:22 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
+from frontend.views.loop_build_view import LoopBuildView
+
+
+class IntegrationLoopBuildView(LoopBuildView):
+
+    model = IntegrationLoop

=== modified file 'dashboard/frontend/kernel_build/models/kernel_loop.py'
--- dashboard/frontend/kernel_build/models/kernel_loop.py	2012-08-24 13:00:02 +0000
+++ dashboard/frontend/kernel_build/models/kernel_loop.py	2012-08-24 14:25:22 +0000
@@ -114,7 +114,7 @@
 
     def save(self, *args, **kwargs):
         self.server = JenkinsServer.objects.get(id=1)
-        super(KernelLoop, self).save(*args, **kwargs)
+        super(self.__class__, self).save(*args, **kwargs)
         # We do not want a failure in remote server to affect the
         # CI Loop flow.
         try:
@@ -122,9 +122,3 @@
         except:
             # TODO: Log error.
             pass
-
-    def schedule_build(self):
-        # Every time before the build is scheduled, update the
-        # loop config on the remote server.
-        self.server.create_or_update_loop(self)
-        super(KernelLoop, self).schedule_build()

=== modified file 'dashboard/frontend/kernel_build/templates/kernel_loop_detail.html'
--- dashboard/frontend/kernel_build/templates/kernel_loop_detail.html	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/templates/kernel_loop_detail.html	2012-08-24 14:25:22 +0000
@@ -39,14 +39,14 @@
 {% block scripts %}
 <script type="text/javascript">
 $("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/loop/build/{{ kernel_loop_detail.name }}/", function(data) {
+  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/kernel/build/{{ kernel_loop_detail.name }}/", function(data) {
     data = $.parseJSON(data);
     $("<div/>", {
       "class": "test",
       text: "Build: " + data[0].fields.build_number + " || " +
                         data[0].fields.status + " || " +
                         data[0].fields.duration + " || " +
-                        data[0].fields.remote_number,
+                        data[0].fields.remote_number
     })
     .prependTo($("#builds"));
   });

=== modified file 'dashboard/frontend/kernel_build/urls.py'
--- dashboard/frontend/kernel_build/urls.py	2012-08-20 20:12:55 +0000
+++ dashboard/frontend/kernel_build/urls.py	2012-08-24 14:25:22 +0000
@@ -22,6 +22,8 @@
     import KernelLoopUpdateView
 from frontend.kernel_build.views.kernel_loop_detail_view \
     import KernelLoopDetailView
+from frontend.kernel_build.views.kernel_loop_build_view \
+    import KernelLoopBuildView
 
 
 urlpatterns = patterns('',
@@ -31,4 +33,6 @@
         KernelLoopDetailView.as_view(), name='KernelLoopDetail'),
     url(r'^kernel/update/(?P<slug>[\w|\W]+)/$',
         KernelLoopUpdateView.as_view(), name='KernelLoopUpdate'),
+    url(r'^kernel/build/(?P<slug>[\w|\W]+)/$',
+        KernelLoopBuildView.as_view(), name='KernelLoopBuild'),
 )

=== added file 'dashboard/frontend/kernel_build/views/kernel_loop_build_view.py'
--- dashboard/frontend/kernel_build/views/kernel_loop_build_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/kernel_build/views/kernel_loop_build_view.py	2012-08-24 14:25:22 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from frontend.kernel_build.models.kernel_loop import KernelLoop
+from frontend.views.loop_build_view import LoopBuildView
+
+
+class KernelLoopBuildView(LoopBuildView):
+
+    model = KernelLoop

=== modified file 'dashboard/frontend/models/loop.py'
--- dashboard/frontend/models/loop.py	2012-08-24 12:02:17 +0000
+++ dashboard/frontend/models/loop.py	2012-08-24 14:25:22 +0000
@@ -33,6 +33,11 @@
     is_official = models.BooleanField(default=False,
                                       verbose_name='Build is official')
 
+    # List of fields to be excluded by default from the base64 encoded config.
+    # If a subclass needs different fields, it is necessary to override this
+    # variable.
+    EXCLUDE_LIST = ['id', 'name', 'server', 'loop_ptr']
+
     def __init__(self, *args, **kwargs):
         self.log = Logger.getClassLogger(self)
         super(Loop, self).__init__(*args, **kwargs)
@@ -43,6 +48,11 @@
         Also try to send a build job signal to the server, but if it fails,
         ignore it.
         '''
+
+        # Every time before the build is scheduled, update the
+        # loop config on the remote server.
+        self.server.create_or_update_loop(self)
+
         from frontend.models.loop_build import LoopBuild
         build = LoopBuild()
         build.loop = self