Merge lp:~linaro-infrastructure/linaro-ci-dashboard/models-design into lp:linaro-ci-dashboard

[Stevan Radaković]

New app for the models.
Separating models into files.
Create makefile with couple of targets.
Models design and syncjobs method with tests.

[Deepti B. Kalakeri (deeptik)]

Overall changes looks good. Some suggestion here:

An important field of the Build record should be a build number.
so we need to make bnum = models.Integer(PrimaryKey=True) as part of the JenkinsBuild Model.

I would prefer not to expose the password in the initial_data.json fixture. This is not secure.
We should probably have a variable in settings.py which we import and set the values to these fields later.
We should provide dummy values to these variables and merge it in upstream and when we actually deploy this
on production use the actual values to set them.
Also, we should make use of the API token instead of the using the plain passwords.

Thanks!!!
Deepti.

review: Needs Fixing

[lp:~linaro-infrastructure/linaro-ci-dashboard/models-design]

29. By Stevan Radaković on 2012-07-13

Add lib/* to .bzrignore.

[Данило Шеган (danilo)]

It would be good if we could have the "dependencies" not be a .phony target (i.e. build them only when necessary), so we could have tests and run depend on it.

Is the "syncdb" call needed/usable with south? I believe we need to use "migrate" command instead.

And we should definitely rebase before landing this (removal of the jenkinsjob from the frontend is a clear example of what we don't want to keep references of).

For JenkinsJob/JenkinsBuild, I believe we do not really need them: having a Loop and LoopBuild classes in the frontend should be enough. They should not really depend on the Jenkins classes, except for the minimal global interface (like "run a build", "get build results", "is build finished", etc.).

review: Needs Fixing

[lp:~linaro-infrastructure/linaro-ci-dashboard/models-design]

30. By Stevan Radaković on 2012-07-13

Fix README typo.

31. By Stevan Radaković on 2012-07-13

Remove unnecessary migration files. Fix Makefile a bit and update README.

32. By Stevan Radaković on 2012-07-16

Moved Job and JobBuild to Loop and LoopBuild. Moved import_jenkins_job method to JenkinsServer model (including tests).

33. By Stevan Radaković on 2012-07-16

Remove running of jenkins job tests, file is removed.

34. By Stevan Radaković on 2012-07-16

Add migration file for frontend.

[Данило Шеган (danilo)]

Thanks for all the improvements: looks good.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-07-06 12:51:21 +0000
+++ .bzrignore	2012-07-16 12:59:18 +0000
@@ -1,1 +1,2 @@
 *.db
+lib/*

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2012-07-16 12:59:18 +0000
@@ -0,0 +1,35 @@
+# Makefile for linaro-ci-dashboard
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  dependencies	to install ci-dashboard dependency libs"
+	@echo "  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"
+
+create-migration: syncdb
+	python dashboard/manage.py schemamigration frontend --auto || \
+			echo "No changes to frontend models."
+	python dashboard/manage.py schemamigration jenkins --auto || \
+			echo "No changes to jenkins models."
+	python dashboard/manage.py migrate
+
+dependencies:
+	PYTHONPATH=$(shell pwd)/lib easy_install \
+				--install-dir=$(shell pwd)/lib jenkinsapi
+
+migrate: syncdb
+	python dashboard/manage.py migrate
+
+runserver: migrate
+	python dashboard/manage.py runserver
+
+syncdb: dependencies
+	python dashboard/manage.py syncdb
+
+test:
+	python dashboard/manage.py test frontend \
+					jenkins
+
+.PHONY: help migration test

=== modified file 'README'
--- README	2012-07-11 10:20:55 +0000
+++ README	2012-07-16 12:59:18 +0000
@@ -19,8 +19,7 @@
 Running the application
 -----------------------
 
-  $ python dashboard/manage.py build  # only for first time run
-  $ python dashboard/manage.py runserver
+  $ make runserver
 
 
 Database migration with South
@@ -29,9 +28,9 @@
 We now provide database migrations with django south. All of the migrations
 files are stored in each app directories (i.e. frontend/migrations).
 Whenever any of the models are changed, it is strongly advised to run
-South' schemamigration command for the particular application:
+South' schemamigration command:
 
-  $ python dashboard/manage.py schemamigration frontend --auto
+  $ make migration
 
 
 Tests
@@ -44,11 +43,6 @@
 
   python-mock
 
-To run all tests:
-
-  $ python dashboard/manage.py test
-
-To run only tests for the frontend application within the CI Dashboard
-tool run:
-
-  $ python dashboard/manage.py test frontend
+To run the tests:
+
+  $ make test

=== removed file 'dashboard/frontend/management/commands/build.py'
--- dashboard/frontend/management/commands/build.py	2012-07-10 12:24:59 +0000
+++ dashboard/frontend/management/commands/build.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# 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/>.
-# Django settings for dashboard project.
-
-from django.core import management
-from django.core.management.base import NoArgsCommand, CommandError
-from django.conf import settings
-import os
-from setuptools.command import easy_install
-
-
-class Command(NoArgsCommand):
-    help = 'Call django syncdb command which takes no arguments and ' + \
-    'install jenkinsapi module from pypi.'
-
-    def handle_noargs(self, **options):
-
-        try:
-            management.call_command('syncdb', **options)
-        except CommandError, e:
-            print "CommandError: syncdb command failed: " + str(e)
-
-        self.install_pypi_package("jenkinsapi")
-
-    def install_pypi_package(self, package):
-        install_path = settings.DEPS_INSTALL_PATH
-        os.environ["PYTHONPATH"] = install_path
-        easy_install.main(["-U", "--install-dir=" + install_path, package])

=== added file 'dashboard/frontend/migrations/0001_initial.py'
--- dashboard/frontend/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/migrations/0001_initial.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,61 @@
+# 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 'Loop'
+        db.create_table('frontend_loop', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=200)),
+            ('server', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['jenkins.JenkinsServer'])),
+        ))
+        db.send_create_signal('frontend', ['Loop'])
+
+        # Adding model 'LoopBuild'
+        db.create_table('frontend_loopbuild', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('loop', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['frontend.Loop'])),
+            ('status', self.gf('django.db.models.fields.CharField')(max_length=20)),
+            ('duration', self.gf('django.db.models.fields.DecimalField')(max_digits=8, decimal_places=2)),
+        ))
+        db.send_create_signal('frontend', ['LoopBuild'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Loop'
+        db.delete_table('frontend_loop')
+
+        # Deleting model 'LoopBuild'
+        db.delete_table('frontend_loopbuild')
+
+
+    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['jenkins.JenkinsServer']"})
+        },
+        'frontend.loopbuild': {
+            'Meta': {'object_name': 'LoopBuild'},
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'loop': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['frontend.Loop']"}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkins.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 = ['frontend']

=== removed file 'dashboard/frontend/migrations/0001_initial.py'
--- dashboard/frontend/migrations/0001_initial.py	2012-07-11 10:20:55 +0000
+++ dashboard/frontend/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# 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 'JenkinsJob'
-        db.create_table('frontend_jenkinsjob', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=200)),
-        ))
-        db.send_create_signal('frontend', ['JenkinsJob'])
-
-
-    def backwards(self, orm):
-        
-        # Deleting model 'JenkinsJob'
-        db.delete_table('frontend_jenkinsjob')
-
-
-    models = {
-        'frontend.jenkinsjob': {
-            'Meta': {'object_name': 'JenkinsJob'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        }
-    }
-
-    complete_apps = ['frontend']

=== added directory 'dashboard/frontend/models'
=== removed file 'dashboard/frontend/models.py'
--- dashboard/frontend/models.py	2012-07-11 10:20:55 +0000
+++ dashboard/frontend/models.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/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 django.db import models
-
-class JenkinsJob(models.Model):
-    name = models.CharField(max_length=200)
-

=== added file 'dashboard/frontend/models/__init__.py'
--- dashboard/frontend/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/models/__init__.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,2 @@
+from frontend.models.loop import Loop
+from frontend.models.loop_build import LoopBuild

=== added file 'dashboard/frontend/models/loop.py'
--- dashboard/frontend/models/loop.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/models/loop.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,28 @@
+#!/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 django.db import models
+import jenkins
+
+
+class Loop(models.Model):
+    class Meta:
+        app_label = 'frontend'
+
+    name = models.CharField(max_length=200, unique=True)
+    server = models.ForeignKey(jenkins.models.jenkins_server.JenkinsServer)

=== added file 'dashboard/frontend/models/loop_build.py'
--- dashboard/frontend/models/loop_build.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/models/loop_build.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,34 @@
+#!/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 django.db import models
+from frontend.models.loop import Loop
+
+
+class LoopBuild(models.Model):
+    class Meta:
+        app_label = 'frontend'
+
+    BUILD_STATUS = (
+        ('failure','FAILURE'),
+        ('success','SUCCESS'),
+        ('aborted','ABORTED'),
+    )
+    loop = models.ForeignKey(Loop)
+    status = models.CharField(max_length=20, choices=BUILD_STATUS)
+    duration = models.DecimalField(max_digits=8, decimal_places=2)

=== modified file 'dashboard/frontend/views/index_view.py'
--- dashboard/frontend/views/index_view.py	2012-07-06 12:30:37 +0000
+++ dashboard/frontend/views/index_view.py	2012-07-16 12:59:18 +0000
@@ -19,6 +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 jenkins.models.jenkins_server import JenkinsServer
 
 
 class IndexView(TemplateView):

=== added directory 'dashboard/jenkins'
=== added file 'dashboard/jenkins/__init__.py'
=== added directory 'dashboard/jenkins/migrations'
=== added file 'dashboard/jenkins/migrations/0001_initial.py'
--- dashboard/jenkins/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/migrations/0001_initial.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,71 @@
+# 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 'JenkinsServer'
+        db.create_table('jenkins_jenkinsserver', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('url', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('username', self.gf('django.db.models.fields.CharField')(max_length=100)),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=100)),
+        ))
+        db.send_create_signal('jenkins', ['JenkinsServer'])
+
+        # Adding model 'JenkinsJob'
+        db.create_table('jenkins_jenkinsjob', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=200)),
+        ))
+        db.send_create_signal('jenkins', ['JenkinsJob'])
+
+        # Adding model 'JenkinsBuild'
+        db.create_table('jenkins_jenkinsbuild', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('job', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['jenkins.JenkinsJob'])),
+            ('status', self.gf('django.db.models.fields.CharField')(max_length=20)),
+            ('duration', self.gf('django.db.models.fields.DecimalField')(max_digits=8, decimal_places=2)),
+        ))
+        db.send_create_signal('jenkins', ['JenkinsBuild'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'JenkinsServer'
+        db.delete_table('jenkins_jenkinsserver')
+
+        # Deleting model 'JenkinsJob'
+        db.delete_table('jenkins_jenkinsjob')
+
+        # Deleting model 'JenkinsBuild'
+        db.delete_table('jenkins_jenkinsbuild')
+
+
+    models = {
+        'jenkins.jenkinsbuild': {
+            'Meta': {'object_name': 'JenkinsBuild'},
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkins.JenkinsJob']"}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkins.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'jenkins.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 = ['jenkins']

=== added file 'dashboard/jenkins/migrations/0002_auto__add_field_jenkinsjob_server.py'
--- dashboard/jenkins/migrations/0002_auto__add_field_jenkinsjob_server.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/migrations/0002_auto__add_field_jenkinsjob_server.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,44 @@
+# 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 field 'JenkinsJob.server'
+        db.add_column('jenkins_jenkinsjob', 'server', self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['jenkins.JenkinsServer']), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'JenkinsJob.server'
+        db.delete_column('jenkins_jenkinsjob', 'server_id')
+
+
+    models = {
+        'jenkins.jenkinsbuild': {
+            'Meta': {'object_name': 'JenkinsBuild'},
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkins.JenkinsJob']"}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkins.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkins.JenkinsServer']"})
+        },
+        'jenkins.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 = ['jenkins']

=== added file 'dashboard/jenkins/migrations/0003_auto__add_unique_jenkinsjob_name.py'
--- dashboard/jenkins/migrations/0003_auto__add_unique_jenkinsjob_name.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/migrations/0003_auto__add_unique_jenkinsjob_name.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,44 @@
+# 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 unique constraint on 'JenkinsJob', fields ['name']
+        db.create_unique('jenkins_jenkinsjob', ['name'])
+
+
+    def backwards(self, orm):
+        
+        # Removing unique constraint on 'JenkinsJob', fields ['name']
+        db.delete_unique('jenkins_jenkinsjob', ['name'])
+
+
+    models = {
+        'jenkins.jenkinsbuild': {
+            'Meta': {'object_name': 'JenkinsBuild'},
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkins.JenkinsJob']"}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkins.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob'},
+            '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['jenkins.JenkinsServer']"})
+        },
+        'jenkins.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 = ['jenkins']

=== added file 'dashboard/jenkins/migrations/__init__.py'
=== added directory 'dashboard/jenkins/models'
=== added file 'dashboard/jenkins/models/__init__.py'
--- dashboard/jenkins/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/models/__init__.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,1 @@
+from jenkins.models.jenkins_server import JenkinsServer

=== added file 'dashboard/jenkins/models/jenkins_server.py'
--- dashboard/jenkins/models/jenkins_server.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/models/jenkins_server.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,80 @@
+#!/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 django.db import models
+from jenkinsapi.jenkins import Jenkins
+
+
+class JenkinsServer(models.Model):
+    class Meta:
+        app_label = 'jenkins'
+
+    url = models.CharField(max_length=255)
+    username = models.CharField(max_length=100)
+    password = models.CharField(max_length=100)
+
+    def __init__(self, *args, **kwargs):
+        super(JenkinsServer, self).__init__(*args, **kwargs)
+        self.jenkins = Jenkins(self.url,
+                               self.username.encode('utf-8'),
+                               self.password.encode('utf-8'))
+
+    def import_jenkins_job(self, jobname):
+        from frontend.models.loop import Loop
+        job = self.jenkins.get_job(jobname)
+        loop = Loop()
+        loop.name = job.name
+        loop.server = self
+        loop.save()
+
+    def sync_jobs(self):
+        """Sync jobs in dashboard DB with jobs in jenkins server.
+
+        Removes all deleted jenkins jobs from dashboard db and
+        adds all newly create jobs in dashboard db."""
+
+        jenkins_jobs = self.jenkins.get_jobs()
+        loops = self.loop_set.all()
+
+        jenkins_jobs_names = [job[0] for job in jenkins_jobs]
+        loop_names = [loop.name for loop in loops]
+
+        # Remove jobs present in our DB but not in Jenkins
+        self.prune_jobs(self.unique_items(loop_names,
+                                          jenkins_jobs_names))
+
+        # Add jobs present in Jenkins but not our DB
+        self.graft_jobs(self.unique_items(jenkins_jobs_names,
+                                          loop_names))
+
+    def prune_jobs(self, jobs):
+        """Remove all items from 'jobs' list from the database."""
+        for loop in self.loop_set.all():
+            if loop.name in jobs:
+                loop.delete()
+
+    def graft_jobs(self, jobs):
+        """Find all items from 'jobs' list in jenkins and add them
+        to the database."""
+
+        for job in jobs:
+            self.import_jenkins_job(job)
+
+    def unique_items(self, list_1, list_2):
+        """Return a list of items that are present in list_1 but not list_2."""
+        return [item for item in list_1 if item not in list_2]

=== added directory 'dashboard/jenkins/tests'
=== added file 'dashboard/jenkins/tests/__init__.py'
--- dashboard/jenkins/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/tests/__init__.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,6 @@
+from dashboard.jenkins.tests.test_jenkins_server import *
+
+#starts the test suite
+__test__= {
+           'JenkinsServerTests': JenkinsServerTests,
+           }

=== added file 'dashboard/jenkins/tests/test_jenkins_server.py'
--- dashboard/jenkins/tests/test_jenkins_server.py	1970-01-01 00:00:00 +0000
+++ dashboard/jenkins/tests/test_jenkins_server.py	2012-07-16 12:59:18 +0000
@@ -0,0 +1,88 @@
+#!/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 django.core.management.base import CommandError
+from django.contrib.auth.models import User
+from django.db import IntegrityError
+from django.test import TestCase
+from jenkins.models.jenkins_server import JenkinsServer
+from jenkinsapi.exceptions import UnknownJob
+from frontend.models.loop import Loop
+from mock import Mock, patch
+
+
+class JenkinsServerTests(TestCase):
+
+    def setUp(self):
+        self.server = JenkinsServer.objects.get(id=1)
+        self.test_job_name = "Test job 2"
+
+    def test_import_jenkins_job_existing(self):
+        loop = Loop()
+        loop.name = self.test_job_name
+        loop.server = self.server
+        loop.save()
+        with self.assertRaises(IntegrityError):
+            self.server.import_jenkins_job(self.test_job_name)
+
+    def test_import_jenkins_job_non_existing(self):
+        with self.assertRaises(UnknownJob):
+            self.server.import_jenkins_job("non-existing-jenkins-job")
+
+    def test_import_jenkins_job(self):
+        loop = Loop()
+        self.server.import_jenkins_job(self.test_job_name)
+        loop = Loop.objects.get(name=self.test_job_name)
+        self.assertIsNotNone(loop)
+
+    def test_sync_jobs(self):
+        self.server.sync_jobs()
+        loops = [loop.name for loop in
+                        self.server.loop_set.all()]
+        jenkins_jobs = [job[0] for job in
+                        self.server.jenkins.get_jobs()]
+        jenkins_jobs.sort()
+        loops.sort()
+        self.assertEquals(loops, jenkins_jobs)
+
+    def test_unique_items(self):
+        list_1 = ["1","4","5"]
+        list_2 = ["1","2","5"]
+        self.assertEquals(["4"], self.server.unique_items(list_1, list_2))
+        self.assertEquals(["2"], self.server.unique_items(list_2, list_1))
+
+    def test_graft_jobs(self):
+        # This must be present on Jenkins server
+        jobs = [self.test_job_name]
+        self.server.graft_jobs(jobs)
+        loops = [loop.name.encode("utf8") for loop in
+                          self.server.loop_set.all()]
+        loops.sort()
+        self.assertEquals([self.test_job_name], loops)
+
+    def test_prune_jobs(self):
+        loop = Loop()
+        loop.name = self.test_job_name
+        loop.server = self.server
+        loop.save()
+
+        jobs = [self.test_job_name]
+        self.server.prune_jobs(jobs)
+
+        loops = [loop.name.encode("utf8") for loop in
+                          self.server.loop_set.all()]
+        self.assertNotIn(self.test_job_name, loops)

=== added directory 'dashboard/jenkins/views'
=== modified file 'dashboard/manage.py'
--- dashboard/manage.py	2012-07-06 12:30:37 +0000
+++ dashboard/manage.py	2012-07-16 12:59:18 +0000
@@ -18,10 +18,11 @@
 
 from django.core.management import execute_manager
 import imp
+import os
+import sys
 try:
     imp.find_module('settings')  # Assumed to be in the same directory.
 except ImportError:
-    import sys
     sys.stderr.write("Error: Can't find the file 'settings.py' in the " + \
                      "directory containing %r. It appears you've " + \
                      "customized things.\nYou'll have to run " + \
@@ -32,4 +33,7 @@
 import settings
 
 if __name__ == "__main__":
+    for d in os.listdir(settings.DEPS_INSTALL_PATH):
+        if os.path.isdir(os.path.join(settings.DEPS_INSTALL_PATH, d)):
+            sys.path.append(os.path.join(settings.DEPS_INSTALL_PATH, d))
     execute_manager(settings)

=== modified file 'dashboard/settings.py'
--- dashboard/settings.py	2012-07-11 10:20:55 +0000
+++ dashboard/settings.py	2012-07-16 12:59:18 +0000
@@ -17,6 +17,7 @@
 # Django settings for dashboard project.
 
 import os
+import sys
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -41,6 +42,8 @@
     }
 }
 
+SOUTH_TESTS_MIGRATE = False
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -132,6 +135,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django_openid_auth',
+    'jenkins',
     'frontend',
     'south',
     # Uncomment the next line to enable the admin: