Merge lp:~milo/linaro-ci-dashboard/android-build-model-refactor into lp:linaro-ci-dashboard

[Milo Casagrande]

This is the refactoring of the android build model, as an "inside app", under the "frontend" one.
If this is the agreed approach, I will continue and refactor the rest (mostly the integration_loop one, keeping the loop model under the frontend).

[Georgy Redkozubov (gesha)]

The starting steps look good.

review: Approve

[Stevan Radaković (stevanr)]

Thanks for refactoring things Milo.

One thing still bothers me a lot and that's the jenkins config.
In my opinion, this should not be separated from the jenkins server model, because at some point (even though the jenkins server is internally considered singleton for now), we might have more then one jenkins server connected with our app and then we will not know which config refers to which server. And it just makes sense that the jenkins server configuration is part of the jenkins server itself, n'est-ce pas? :)

So if you agree with this there are two possible solutions that I see (with me routing for the first one):
1. Remove the config model and add the two fields (config_template and config) to the jenkins server model.
2. Keep the config model, but add one-to-one relation between config model and jenkins server model. This will make the relation between the Loop and the JenkinsConfig models obsolete so it should be removed.

review: Needs Fixing (modeling)

[Georgy Redkozubov (gesha)]

> Thanks for refactoring things Milo.
>
> One thing still bothers me a lot and that's the jenkins config.
> In my opinion, this should not be separated from the jenkins server model,
> because at some point (even though the jenkins server is internally considered
> singleton for now), we might have more then one jenkins server connected with
> our app and then we will not know which config refers to which server. And it
> just makes sense that the jenkins server configuration is part of the jenkins
> server itself, n'est-ce pas? :)

Good point, but the it's not bound to the jenkins server, ok, better to say it's a job config for a particular loop which configuration is based on the template and filled with the data before sending it to jenkins job.
There were 3 options:
1) Generate all needed job config fields on the fly from DB when creating/updating job.
2) Add fields to Loop model and do it once when creating/updating job.
3) Add new model and link it to Loop and do it once when creating/updating job.
Second approach wonn't work for us, in case we need to add new configuration fields we have to update all loops.
First and third approaches are similar.
We decided to go third way. We can have common configuration fields like 'command', 'config' generated in one place and specific to particular loop type generate in that loop class.
May be I'm making things complicate and there is easier way? :)

>
> So if you agree with this there are two possible solutions that I see (with me
> routing for the first one):
> 1. Remove the config model and add the two fields (config_template and config)
> to the jenkins server model.
> 2. Keep the config model, but add one-to-one relation between config model and
> jenkins server model. This will make the relation between the Loop and the
> JenkinsConfig models obsolete so it should be removed.

[Stevan Radaković (stevanr)]

> > Thanks for refactoring things Milo.
> >
> > One thing still bothers me a lot and that's the jenkins config.
> > In my opinion, this should not be separated from the jenkins server model,
> > because at some point (even though the jenkins server is internally
> considered
> > singleton for now), we might have more then one jenkins server connected
> with
> > our app and then we will not know which config refers to which server. And
> it
> > just makes sense that the jenkins server configuration is part of the
> jenkins
> > server itself, n'est-ce pas? :)
>
> Good point, but the it's not bound to the jenkins server, ok, better to say
> it's a job config for a particular loop which configuration is based on the
> template and filled with the data before sending it to jenkins job.
> There were 3 options:
> 1) Generate all needed job config fields on the fly from DB when
> creating/updating job.
> 2) Add fields to Loop model and do it once when creating/updating job.
> 3) Add new model and link it to Loop and do it once when creating/updating
> job.
> Second approach wonn't work for us, in case we need to add new configuration
> fields we have to update all loops.
> First and third approaches are similar.
> We decided to go third way. We can have common configuration fields like
> 'command', 'config' generated in one place and specific to particular loop
> type generate in that loop class.
> May be I'm making things complicate and there is easier way? :)
>

Ok sorry I didn't know that it's representing a job config since it's called the JenkinsConfig and it's part of the jenkinsserver APP, so I realized it's representing general Jenkins server configuration.

With that thing cleared up, I would like us to remember general guidelines for the CI Loops development presented by Danilo couple of weeks ago. The point was that we have as small amount of dependency on jenkins in our frontend app as possible.

In my opinion this new dependency is redundant since we must update the jenkins job each time the loop is created or updated anyway, so why keep it in the DB when we must do it on-the-fly anyway.
If we rly want to keep the job config anyway, I'd suggest linking it with loop the other way around, by putting loop_id as foreign key in JenkinsConfig (which should be renamed anyway if we decide to keep it) and adding unique constraint, so it's one-on-one relationship. Of course, all the updates to the jenkins config table should then be from the jenkinsserver up, and in no case from the frontend.

I hope this clears up the things a bit..

> >
> > So if you agree with this there are two possible solutions that I see (with
> me
> > routing for the first one):
> > 1. Remove the config model and add the two fields (config_template and
> config)
> > to the jenkins server model.
> > 2. Keep the config model, but add one-to-one relation between config model
> and
> > jenkins server model. This will make the relation between the Loop and the
> > JenkinsConfig models obsolete so it should be removed.

[Milo Casagrande (milo)]

On Wed, Aug 15, 2012 at 12:50 PM, Stevan Radaković
<email address hidden> wrote:
>
> Ok sorry I didn't know that it's representing a job config since it's called the JenkinsConfig and it's part of the jenkinsserver APP, so I realized it's representing general Jenkins server configuration.

Our bad on choosing that name I guess... but as gesha explained, is a
parameter necessary for the the Android Build job, and is called
CONFIG inside Jenkins.

> With that thing cleared up, I would like us to remember general guidelines for the CI Loops development presented by Danilo couple of weeks ago. The point was that we have as small amount of dependency on jenkins in our frontend app as possible.

Yep, that is right.

> In my opinion this new dependency is redundant since we must update the jenkins job each time the loop is created or updated anyway, so why keep it in the DB when we must do it on-the-fly anyway.

From what I saw from the Android builds, they are updated seldomly.
Once a loop is created and doesn't explode, it is left like that.
The on-the-fly option was considered, but since jobs are not updated
that much, it made more sense to store that parameter somewhere and
retrieve it. I think it is more of a tradeoff between taking up a
little bit more space, than starting to create base64 encoded strings
for all the builds on the fly.

> If we rly want to keep the job config anyway, I'd suggest linking it with loop the other way around, by putting loop_id as foreign key in JenkinsConfig (which should be renamed anyway if we decide to keep it) and adding unique constraint, so it's one-on-one relationship. Of course, all the updates to the jenkins config table should then be from the jenkinsserver up, and in no case from the frontend.

Name will be changed, for sure.
Good point about reverting the direction of the relationship. For the
constraint I was considering it, but didn't add it since I wanted to
see if we needed other fields in there that could have been unique
together too.

Another thing, since this is only related to Android, could be to
extend the android_loop model and store the base64 encoded "CONFIG" in
there.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[lp:~milo/linaro-ci-dashboard/android-build-model-refactor]

27. By Milo Casagrande on 2012-08-16

Removed JenkinsConfig.

[Milo Casagrande (milo)]

With revno 27 I removed the JenkinsConfig class as discussed during the meeting.

[lp:~milo/linaro-ci-dashboard/android-build-model-refactor]

28. By Milo Casagrande on 2012-08-16

Removed jenkins_config from migrations.

29. By Milo Casagrande on 2012-08-16

integration_loop as subapps inside frontend.

30. By Milo Casagrande on 2012-08-16

Fixed Makefile, fixed imports in tests.

31. By Milo Casagrande on 2012-08-17

Fixed problems with tests (remember to clear up .pyc files).

[Milo Casagrande (milo)]

With revno 31 there is the final refactoring of integration_loop as a subapp, and tests are now fixed (had problems with .pyc files around in the projects dir).

[Stevan Radaković (stevanr)]

I thinks we will still need to talk about the layout of subapps in the frontend app, but this is good enough for landing, we can easily refactor later.
Approve +1.

review: Approve (code, modeling)

=== modified file 'Makefile'
--- Makefile	2012-07-19 08:00:53 +0000
+++ Makefile	2012-08-17 07:43:18 +0000
@@ -1,17 +1,21 @@
 # Makefile for linaro-ci-dashboard
 
 help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  migration	to update the database schema with the" \
+	@echo "Please use \`make <target>' where <target> is one of:"
+	@echo "  create-migration   to update the database schema with the" \
 	      			"latest model changes"
-	@echo "  runserver	to run the django web server"
-	@echo "  test		to run the unit tests"
+	@echo "  runserver          to run the django web server"
+	@echo "  test               to run the unit tests"
 
 create-migration: syncdb
 	python dashboard/manage.py schemamigration frontend --auto || \
 			echo "No changes to frontend models."
-	python dashboard/manage.py schemamigration jenkins --auto || \
+	python dashboard/manage.py schemamigration jenkinsserver --auto || \
 			echo "No changes to jenkins models."
+	python dashboard/manage.py schemamigration android_build --auto || \
+			echo "No changes to android_build models."
+	python dashboard/manage.py schemamigration integration_loop --auto || \
+			echo "No changes to integration_loop models."
 	python dashboard/manage.py migrate
 
 migrate: syncdb
@@ -25,7 +29,6 @@
 
 test:
 	python dashboard/manage.py jenkins start
-	python dashboard/manage.py test frontend \
-					jenkinsserver
+	python dashboard/manage.py test frontend jenkinsserver
 
 .PHONY: help migration test

=== modified file 'README'
--- README	2012-07-24 21:34:26 +0000
+++ README	2012-08-17 07:43:18 +0000
@@ -46,7 +46,7 @@
 Whenever any of the models are changed, it is strongly advised to run
 South' schemamigration command:
 
-  $ make migration
+  $ make migrate
 
 
 Tests

=== added directory 'dashboard/frontend/android_build'
=== added file 'dashboard/frontend/android_build/__init__.py'
=== added directory 'dashboard/frontend/android_build/migrations'
=== added file 'dashboard/frontend/android_build/migrations/0001_initial.py'
--- dashboard/frontend/android_build/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_build/migrations/0001_initial.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,92 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'AndroidLoop'
+        db.create_table('android_build_androidloop', (
+            ('loop_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['frontend.Loop'], unique=True, primary_key=True)),
+            ('build_type', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('manifest_repo', self.gf('django.db.models.fields.CharField')(default='git://android.git.kernel.org/platform/manifest.git', max_length=255)),
+            ('manifest_branch', self.gf('django.db.models.fields.CharField')(default='master', max_length=50)),
+            ('repo_quiet', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('manifest_filename', self.gf('django.db.models.fields.CharField')(default='default.xml', max_length=255)),
+            ('make_targets', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('make_jobs', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('ramdisk_size', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
+            ('external_tarball', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('build_fs_image', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('fs_image_size', self.gf('django.db.models.fields.CharField')(default='2G', max_length=20, blank=True)),
+            ('user_defined_values', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('toolchain_url', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('target_product', self.gf('django.db.models.fields.CharField')(max_length=50, blank=True)),
+            ('target_tools_prefix', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('binutils_version', self.gf('django.db.models.fields.CharField')(default='2.20.1', max_length=25)),
+            ('binutils_url', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('gcc_version', self.gf('django.db.models.fields.CharField')(default='4.4.0', max_length=25)),
+            ('gcc_url', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('sysroot_ndk_url', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('lava_submit', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('lava_test_plan', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
+            ('lava_submit_fatal', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('lava_android_binaries', self.gf('django.db.models.fields.BooleanField')(default=True)),
+        ))
+        db.send_create_signal('android_build', ['AndroidLoop'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'AndroidLoop'
+        db.delete_table('android_build_androidloop')
+
+
+    models = {
+        'android_build.androidloop': {
+            'Meta': {'object_name': 'AndroidLoop', '_ormbases': ['frontend.Loop']},
+            'binutils_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'binutils_version': ('django.db.models.fields.CharField', [], {'default': "'2.20.1'", 'max_length': '25'}),
+            'build_fs_image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'build_type': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'external_tarball': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'fs_image_size': ('django.db.models.fields.CharField', [], {'default': "'2G'", 'max_length': '20', 'blank': 'True'}),
+            'gcc_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'gcc_version': ('django.db.models.fields.CharField', [], {'default': "'4.4.0'", 'max_length': '25'}),
+            'lava_android_binaries': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'lava_submit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'lava_submit_fatal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'lava_test_plan': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'loop_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['frontend.Loop']", 'unique': 'True', 'primary_key': 'True'}),
+            'make_jobs': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'make_targets': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'manifest_branch': ('django.db.models.fields.CharField', [], {'default': "'master'", 'max_length': '50'}),
+            'manifest_filename': ('django.db.models.fields.CharField', [], {'default': "'default.xml'", 'max_length': '255'}),
+            'manifest_repo': ('django.db.models.fields.CharField', [], {'default': "'git://android.git.kernel.org/platform/manifest.git'", 'max_length': '255'}),
+            'ramdisk_size': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'repo_quiet': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sysroot_ndk_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'target_product': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'target_tools_prefix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'toolchain_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'user_defined_values': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'frontend.loop': {
+            'Meta': {'object_name': 'Loop'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkinsserver.JenkinsServer']"})
+        },
+        'jenkinsserver.jenkinsserver': {
+            'Meta': {'object_name': 'JenkinsServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['android_build']

=== added file 'dashboard/frontend/android_build/migrations/__init__.py'
=== added directory 'dashboard/frontend/android_build/models'
=== added file 'dashboard/frontend/android_build/models/__init__.py'
--- dashboard/frontend/android_build/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_build/models/__init__.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,1 @@
+from frontend.android_build.models.android_loop import AndroidLoop

=== added file 'dashboard/frontend/android_build/models/android_loop.py'
--- dashboard/frontend/android_build/models/android_loop.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_build/models/android_loop.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,127 @@
+# 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 django.db import models
+from frontend.models.loop import Loop
+from jenkinsserver.models.jenkins_server import JenkinsServer
+
+
+# The internal names for the different build type, and a user visible name
+BUILD_ANDROID = (r'build-android', 'Android')
+BUILD_ANDROID_RESTRICTED = (r'build-android-restricted', 'Android Restricted')
+BUILD_ANDROID_TOOLCHAIN = (r'build-android-toolchain', 'Android Toolchain')
+BUILD_ANDROID_TOOLCHAIN_LINARO = (r'build-android-toolchain-linaro',
+                                    'Android Toolchain Linaro')
+# All the supported build types.
+ANDROID_BUILD_TYPES = (
+    BUILD_ANDROID,
+    BUILD_ANDROID_RESTRICTED,
+    BUILD_ANDROID_TOOLCHAIN,
+    BUILD_ANDROID_TOOLCHAIN_LINARO,
+    )
+
+# Inetrnal name of the board, and a user visible name
+BEAGLEBOARD = (r'beagleboard', 'Beagleboard')
+PANDABOARD = (r'panda', 'Pandaboard')
+SNOWBALL = (r'snowball', 'Snowball')
+# The supported boards for the build.
+TARGET_BOARDS = (BEAGLEBOARD, PANDABOARD, SNOWBALL)
+
+
+class AndroidLoop(Loop):
+    """Defines the base class for an Android integration loop."""
+    class Meta:
+        app_label = 'android_build'
+
+    # The default file name for the manifest file.
+    DEFAULT_MANIFEST_FILE = 'default.xml'
+    DEFAULT_REPO = 'git://android.git.kernel.org/platform/manifest.git'
+    DEFAULT_BRANCH = 'master'
+    DEFAULT_BINUTILS = '2.20.1'
+    DEFAULT_GCC = '4.4.0'
+    DEFAULT_IMAGE_SIZE = '2G'
+
+    # BUILD_TYPE
+    build_type = models.CharField(max_length=100, choices=ANDROID_BUILD_TYPES)
+    # MANIFEST_REPO
+    manifest_repo = models.CharField(max_length=255, default=DEFAULT_REPO)
+    # MANIFEST_BRANCH
+    manifest_branch = models.CharField(max_length=50, default=DEFAULT_BRANCH)
+    # REPO_QUIET
+    repo_quiet = models.BooleanField(default=False)
+    # MANIFEST_FILENAME
+    manifest_filename = models.CharField(max_length=255,
+                                         default=DEFAULT_MANIFEST_FILE)
+    # MAKE_TARGETS
+    make_targets = models.CharField(max_length=255, blank=True)
+    # MAKE_JOBS
+    make_jobs = models.PositiveIntegerField(default=0)
+    # RAMDISK_SIZE
+    ramdisk_size = models.PositiveIntegerField(default=0)
+    # EXTERNAL_TARBALL
+    external_tarball = models.CharField(max_length=255, blank=True)
+    # BUILD_FS_IMAGE
+    build_fs_image = models.BooleanField(default=False,
+                                         verbose_name='Build filesystem image')
+    # FS_IMAGE_SIZE
+    fs_image_size = models.CharField(max_length=20,
+                                     blank=True,
+                                     verbose_name='Filesystem image size',
+                                     default=DEFAULT_IMAGE_SIZE)
+    # Users might want to define their own values.
+    user_defined_values = models.TextField(blank=True)
+
+    # Data needed for build of type build-android.
+    toolchain_url = models.CharField(max_length=255, blank=True)
+    target_product = models.CharField(max_length=50, choices=TARGET_BOARDS,
+                                        blank=True)
+    target_tools_prefix = models.CharField(max_length=255, blank=True)
+
+    # Data needed for build of type build-android-toolchain.
+    binutils_version = models.CharField(max_length=25,
+                                        default=DEFAULT_BINUTILS)
+    binutils_url = models.CharField(max_length=255, blank=True)
+
+    gcc_version = models.CharField(max_length=25, default=DEFAULT_GCC)
+    gcc_url = models.CharField(max_length=255, blank=True)
+
+    # TODO need to check the default value for this one.
+    sysroot_ndk_url = models.CharField(max_length=255, blank=True)
+
+    # Data needed for LAVA integration.
+    lava_submit = models.BooleanField(default=False)
+    # TODO need to know the values here
+    lava_test_plan = models.CharField(max_length=255, blank=True)
+    lava_submit_fatal = models.BooleanField(default=True, blank=True)
+    lava_android_binaries = models.BooleanField(default=True, blank=True)
+
+    def save(self, *args, **kwargs):
+        self.server = JenkinsServer.objects.get(id=1)
+        super(AndroidLoop, self).save(*args, **kwargs)
+        # We do not want a failure in remote server to affect the
+        # CI Loop flow.
+        try:
+            self.server.create_or_update_integration_loop(self)
+        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_integration_loop(self)
+        super(AndroidLoop, self).schedule_build()

=== added directory 'dashboard/frontend/android_build/templates'
=== added file 'dashboard/frontend/android_build/templates/__init__.py'
=== added directory 'dashboard/frontend/android_build/tests'
=== added file 'dashboard/frontend/android_build/tests/__init__.py'
=== added file 'dashboard/frontend/android_build/urls.py'
--- dashboard/frontend/android_build/urls.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_build/urls.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,34 @@
+# 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 django.conf.urls.defaults import patterns, include, url
+from frontend.integration_loop.views.integration_loop_create_view \
+    import IntegrationLoopCreateView
+from frontend.integration_loop.views.integration_loop_update_view \
+    import IntegrationLoopUpdateView
+from frontend.integration_loop.views.integration_loop_detail_view \
+    import IntegrationLoopDetailView
+
+
+urlpatterns = patterns('',
+    url(r'^android/create/$',
+        IntegrationLoopCreateView.as_view(), name='AndroidLoopCreate'),
+    url(r'^android/detail/(?P<slug>[\w|\W]+)/$',
+        IntegrationLoopDetailView.as_view(), name='AndroidLoopDetail'),
+    url(r'^android/update/(?P<slug>[\w|\W]+)/$',
+        IntegrationLoopUpdateView.as_view(), name='AndroidLoopUpdate'),
+)

=== added directory 'dashboard/frontend/android_build/views'
=== added file 'dashboard/frontend/android_build/views/__init__.py'
=== added directory 'dashboard/frontend/integration_loop'
=== added file 'dashboard/frontend/integration_loop/__init__.py'
=== added directory 'dashboard/frontend/integration_loop/forms'
=== added file 'dashboard/frontend/integration_loop/forms/__init__.py'
=== renamed file 'dashboard/frontend/forms/integration_loop_form.py' => 'dashboard/frontend/integration_loop/forms/integration_loop_form.py'
--- dashboard/frontend/forms/integration_loop_form.py	2012-07-24 15:15:35 +0000
+++ dashboard/frontend/integration_loop/forms/integration_loop_form.py	2012-08-17 07:43:18 +0000
@@ -17,7 +17,7 @@
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.forms import ModelForm
-from frontend.models.integration_loop import IntegrationLoop
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
 
 
 class IntegrationLoopForm(ModelForm):

=== added directory 'dashboard/frontend/integration_loop/migrations'
=== added file 'dashboard/frontend/integration_loop/migrations/0001_initial.py'
--- dashboard/frontend/integration_loop/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/migrations/0001_initial.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,50 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding model 'IntegrationLoop'
+        db.create_table('integration_loop_integrationloop', (
+            ('loop_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['frontend.Loop'], unique=True, primary_key=True)),
+            ('branch', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('precommand', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('command', self.gf('django.db.models.fields.CharField')(max_length=200)),
+        ))
+        db.send_create_signal('integration_loop', ['IntegrationLoop'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'IntegrationLoop'
+        db.delete_table('integration_loop_integrationloop')
+
+
+    models = {
+        'frontend.loop': {
+            'Meta': {'object_name': 'Loop'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkinsserver.JenkinsServer']"})
+        },
+        'integration_loop.integrationloop': {
+            'Meta': {'object_name': 'IntegrationLoop', '_ormbases': ['frontend.Loop']},
+            'branch': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'command': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'loop_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['frontend.Loop']", 'unique': 'True', 'primary_key': 'True'}),
+            'precommand': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'jenkinsserver.jenkinsserver': {
+            'Meta': {'object_name': 'JenkinsServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['integration_loop']

=== added file 'dashboard/frontend/integration_loop/migrations/__init__.py'
=== added directory 'dashboard/frontend/integration_loop/models'
=== added file 'dashboard/frontend/integration_loop/models/__init__.py'
--- dashboard/frontend/integration_loop/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/models/__init__.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,1 @@
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
\ No newline at end of file

=== renamed file 'dashboard/frontend/models/integration_loop.py' => 'dashboard/frontend/integration_loop/models/integration_loop.py'
--- dashboard/frontend/models/integration_loop.py	2012-07-26 13:25:06 +0000
+++ dashboard/frontend/integration_loop/models/integration_loop.py	2012-08-17 07:43:18 +0000
@@ -16,7 +16,6 @@
 # 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.contrib.auth.models import User
 from django.db import models
 from frontend.models.loop import Loop
 from jenkinsserver.models.jenkins_server import JenkinsServer
@@ -24,7 +23,7 @@
 
 class IntegrationLoop(Loop):
     class Meta:
-        app_label = 'frontend'
+        app_label = 'integration_loop'
 
     branch = models.CharField(max_length=200)
     precommand = models.CharField(max_length=200)

=== added directory 'dashboard/frontend/integration_loop/templates'
=== added file 'dashboard/frontend/integration_loop/templates/__init__.py'
=== renamed file 'dashboard/frontend/templates/integration_loop_create.html' => 'dashboard/frontend/integration_loop/templates/integration_loop_create.html'
=== renamed file 'dashboard/frontend/templates/integration_loop_detail.html' => 'dashboard/frontend/integration_loop/templates/integration_loop_detail.html'
=== renamed file 'dashboard/frontend/templates/integration_loop_update.html' => 'dashboard/frontend/integration_loop/templates/integration_loop_update.html'
=== added file 'dashboard/frontend/integration_loop/urls.py'
--- dashboard/frontend/integration_loop/urls.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/urls.py	2012-08-17 07:43:18 +0000
@@ -0,0 +1,34 @@
+# 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 django.conf.urls.defaults import patterns, include, url
+from frontend.integration_loop.views.integration_loop_create_view\
+    import IntegrationLoopCreateView
+from frontend.integration_loop.views.integration_loop_update_view\
+    import IntegrationLoopUpdateView
+from frontend.integration_loop.views.integration_loop_detail_view\
+    import IntegrationLoopDetailView
+
+
+urlpatterns = patterns('',
+    url(r'^integration_loop/create/$',
+        IntegrationLoopCreateView.as_view(), name='IntegrationLoopCreate'),
+    url(r'^integration_loop/detail/(?P<slug>[\w|\W]+)/$',
+        IntegrationLoopDetailView.as_view(), name='IntegrationLoopDetail'),
+    url(r'^integration_loop/update/(?P<slug>[\w|\W]+)/$',
+        IntegrationLoopUpdateView.as_view(), name='IntegrationLoopUpdate'),
+)

=== added directory 'dashboard/frontend/integration_loop/views'
=== added file 'dashboard/frontend/integration_loop/views/__init__.py'
=== renamed file 'dashboard/frontend/views/integration_loop_create_view.py' => 'dashboard/frontend/integration_loop/views/integration_loop_create_view.py'
--- dashboard/frontend/views/integration_loop_create_view.py	2012-07-26 13:25:06 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_create_view.py	2012-08-17 07:43:18 +0000
@@ -18,11 +18,11 @@
 
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
 from django.views.generic.edit import CreateView
 from django.utils.decorators import method_decorator
-from frontend.forms.integration_loop_form import IntegrationLoopForm
-from frontend.models.integration_loop import IntegrationLoop
+from frontend.integration_loop.forms.integration_loop_form \
+    import IntegrationLoopForm
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
 
 
 class IntegrationLoopCreateView(CreateView):

=== renamed file 'dashboard/frontend/views/integration_loop_detail_view.py' => 'dashboard/frontend/integration_loop/views/integration_loop_detail_view.py'
--- dashboard/frontend/views/integration_loop_detail_view.py	2012-07-24 15:15:35 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_detail_view.py	2012-08-17 07:43:18 +0000
@@ -19,7 +19,7 @@
 from django.contrib.auth.decorators import login_required
 from django.views.generic.detail import DetailView
 from django.utils.decorators import method_decorator
-from frontend.models.integration_loop import IntegrationLoop
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
 
 
 class IntegrationLoopDetailView(DetailView):

=== renamed file 'dashboard/frontend/views/integration_loop_update_view.py' => 'dashboard/frontend/integration_loop/views/integration_loop_update_view.py'
--- dashboard/frontend/views/integration_loop_update_view.py	2012-07-26 13:25:06 +0000
+++ dashboard/frontend/integration_loop/views/integration_loop_update_view.py	2012-08-17 07:43:18 +0000
@@ -18,11 +18,11 @@
 
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
 from django.views.generic.edit import UpdateView
 from django.utils.decorators import method_decorator
-from frontend.forms.integration_loop_form import IntegrationLoopForm
-from frontend.models.integration_loop import IntegrationLoop
+from frontend.integration_loop.forms.integration_loop_form \
+    import IntegrationLoopForm
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
 
 
 class IntegrationLoopUpdateView(UpdateView):

=== modified file 'dashboard/frontend/migrations/0001_initial.py'
--- dashboard/frontend/migrations/0001_initial.py	2012-07-25 12:20:01 +0000
+++ dashboard/frontend/migrations/0001_initial.py	2012-08-17 07:43:18 +0000
@@ -16,15 +16,6 @@
         ))
         db.send_create_signal('frontend', ['Loop'])
 
-        # Adding model 'IntegrationLoop'
-        db.create_table('frontend_integrationloop', (
-            ('loop_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['frontend.Loop'], unique=True, primary_key=True)),
-            ('branch', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('precommand', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('command', self.gf('django.db.models.fields.CharField')(max_length=200)),
-        ))
-        db.send_create_signal('frontend', ['IntegrationLoop'])
-
         # Adding model 'LoopBuild'
         db.create_table('frontend_loopbuild', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -42,21 +33,11 @@
         # Deleting model 'Loop'
         db.delete_table('frontend_loop')
 
-        # Deleting model 'IntegrationLoop'
-        db.delete_table('frontend_integrationloop')
-
         # Deleting model 'LoopBuild'
         db.delete_table('frontend_loopbuild')
 
 
     models = {
-        'frontend.integrationloop': {
-            'Meta': {'object_name': 'IntegrationLoop', '_ormbases': ['frontend.Loop']},
-            'branch': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'command': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'loop_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['frontend.Loop']", 'unique': 'True', 'primary_key': 'True'}),
-            'precommand': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
         'frontend.loop': {
             'Meta': {'object_name': 'Loop'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),

=== modified file 'dashboard/frontend/models/__init__.py'
--- dashboard/frontend/models/__init__.py	2012-07-24 15:15:35 +0000
+++ dashboard/frontend/models/__init__.py	2012-08-17 07:43:18 +0000
@@ -1,3 +1,2 @@
 from frontend.models.loop import Loop
-from frontend.models.integration_loop import IntegrationLoop
 from frontend.models.loop_build import LoopBuild

=== modified file 'dashboard/frontend/models/loop.py'
--- dashboard/frontend/models/loop.py	2012-07-26 13:25:06 +0000
+++ dashboard/frontend/models/loop.py	2012-08-17 07:43:18 +0000
@@ -16,7 +16,6 @@
 # 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.contrib.auth.models import User
 from django.db import models
 from jenkinsserver.models.jenkins_server import JenkinsServer
 

=== modified file 'dashboard/frontend/tests/test_views.py'
--- dashboard/frontend/tests/test_views.py	2012-07-28 02:27:35 +0000
+++ dashboard/frontend/tests/test_views.py	2012-08-17 07:43:18 +0000
@@ -20,12 +20,12 @@
 
 from frontend.views.home_page_view import HomePageView
 from frontend.views.index_view import IndexView
-from frontend.views.integration_loop_create_view \
-  import IntegrationLoopCreateView
-from frontend.views.integration_loop_update_view \
-  import IntegrationLoopUpdateView
-from frontend.views.integration_loop_detail_view \
-  import IntegrationLoopDetailView
+from frontend.integration_loop.views.integration_loop_create_view \
+    import IntegrationLoopCreateView
+from frontend.integration_loop.views.integration_loop_update_view \
+    import IntegrationLoopUpdateView
+from frontend.integration_loop.views.integration_loop_detail_view \
+    import IntegrationLoopDetailView
 
 
 class HomePageViewTest(TestCase):

=== modified file 'dashboard/frontend/urls.py'
--- dashboard/frontend/urls.py	2012-07-24 15:29:46 +0000
+++ dashboard/frontend/urls.py	2012-08-17 07:43:18 +0000
@@ -19,24 +19,13 @@
 from django.conf.urls.defaults import patterns, include, url
 from frontend.views.home_page_view import HomePageView
 from frontend.views.index_view import IndexView
-from frontend.views.integration_loop_create_view \
-  import IntegrationLoopCreateView
-from frontend.views.integration_loop_update_view \
-  import IntegrationLoopUpdateView
-from frontend.views.integration_loop_detail_view \
-  import IntegrationLoopDetailView
 from frontend.views.loop_build_view import LoopBuildView
 
+
 urlpatterns = patterns('',
     url(r'^$', IndexView.as_view(), name='Index'),
     url(r'^index/$', IndexView.as_view(), name='Index'),
     url(r'^home/$', HomePageView.as_view(), name='Home'),
-    url(r'^integration_loop/create/$',
-        IntegrationLoopCreateView.as_view(), name='IntegrationLoopCreate'),
-    url(r'^integration_loop/detail/(?P<slug>[\w|\W]+)/$',
-        IntegrationLoopDetailView.as_view(), name='IntegrationLoopDetail'),
-    url(r'^integration_loop/update/(?P<slug>[\w|\W]+)/$',
-        IntegrationLoopUpdateView.as_view(), name='IntegrationLoopUpdate'),
     url(r'^loop/build/(?P<slug>[\w|\W]+)/$',
         LoopBuildView.as_view(), name='LoopBuild'),
 )

=== modified file 'dashboard/frontend/views/index_view.py'
--- dashboard/frontend/views/index_view.py	2012-07-24 15:15:35 +0000
+++ dashboard/frontend/views/index_view.py	2012-08-17 07:43:18 +0000
@@ -19,7 +19,7 @@
 from django.views.generic.base import TemplateView
 from django.utils.decorators import method_decorator
 from django.contrib.auth.decorators import login_required
-from frontend.models.integration_loop import IntegrationLoop
+from frontend.integration_loop.models.integration_loop import IntegrationLoop
 
 
 class IndexView(TemplateView):

=== modified file 'dashboard/frontend/views/loop_build_view.py'
--- dashboard/frontend/views/loop_build_view.py	2012-07-20 11:00:36 +0000
+++ dashboard/frontend/views/loop_build_view.py	2012-08-17 07:43:18 +0000
@@ -17,8 +17,6 @@
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib.auth.decorators import login_required
-from django.core import serializers
-from django.views.generic import View
 from django.views.generic.detail import DetailView
 from django.utils.decorators import method_decorator
 from frontend.models.loop import Loop

=== modified file 'dashboard/settings.py'
--- dashboard/settings.py	2012-07-24 21:28:00 +0000
+++ dashboard/settings.py	2012-08-17 07:43:18 +0000
@@ -44,6 +44,7 @@
 }
 
 SOUTH_TESTS_MIGRATE = False
+SKIP_SOUTH_TESTS = True
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -139,6 +140,8 @@
     'django_openid_auth',
     'jenkinsserver',
     'frontend',
+    'frontend.android_build',
+    'frontend.integration_loop',
     'south',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',

=== modified file 'dashboard/urls.py'
--- dashboard/urls.py	2012-07-19 19:58:21 +0000
+++ dashboard/urls.py	2012-08-17 07:43:18 +0000
@@ -30,4 +30,6 @@
     url(r'^js/(?P<path>.*)$', 'django.views.static.serve',
      {'document_root': settings.JS_PATH}),
     url(r'^', include('dashboard.frontend.urls')),
+    url(r'^', include('dashboard.frontend.android_build.urls')),
+    url(r'^', include('dashboard.frontend.integration_loop.urls')),
 )