Merge lp:~dooferlad/linaro-ci-dashboard/add_ci_job_loop into lp:linaro-ci-dashboard

[James Tunnicliffe]

[James Tunnicliffe (dooferlad)]

Crumbs. Got old tests in this. Will remove.

[lp:~dooferlad/linaro-ci-dashboard/add_ci_job_loop]

75. By James Tunnicliffe on 2013-02-11

Removed invalid tests

76. By James Tunnicliffe on 2013-02-11

Removed commented out code

=== modified file 'HACKING'
--- HACKING	2012-09-21 09:24:01 +0000
+++ HACKING	2013-02-11 15:46:21 +0000
@@ -49,6 +49,18 @@
 
 Tests should be written and defined inside each sub-application.
 
+When defining a new application, make sure the model app_label matches what is
+listed in settings.py:
+
+class CIJob(Loop):
+    """Defines the base class for a CI Job."""
+    class Meta:
+        app_label = 'ci_job'
+
+INSTALLED_APPS = (
+...
+    'frontend.ci_job',
+
 == Class Hierarchy ==
 
 === Templates & Views ===

=== modified file 'Makefile'
--- Makefile	2012-09-24 13:18:02 +0000
+++ Makefile	2013-02-11 15:46:21 +0000
@@ -24,6 +24,8 @@
 			echo "No changes to android_textfield_loop models."
 	python dashboard/manage.py schemamigration hwpack_loop --auto || \
 			echo "No changes to hwpack_loop models."
+	python dashboard/manage.py schemamigration ci_job --auto || \
+    			echo "No changes to ci_job models."
 	python dashboard/manage.py migrate
 
 migrate: syncdb

=== modified file 'README'
--- README	2013-02-01 11:49:24 +0000
+++ README	2013-02-11 15:46:21 +0000
@@ -17,6 +17,7 @@
   build-essential
   openjdk-6-jre-headless
   python-tastypie
+  python-simplejson
 
 To unit test the API that tastypie provides you need Django version of at least
 1.4. If you have Django 1.3 the API will still work, but not be unit tested.

=== modified file 'config_template/config.xml'
--- config_template/config.xml	2012-09-20 08:46:37 +0000
+++ config_template/config.xml	2013-02-11 15:46:21 +0000
@@ -50,7 +50,7 @@
   </views>
   <primaryView>All</primaryView>
   <slaveAgentPort>0</slaveAgentPort>
-  <label>IntegrationLoop AndroidLoop KernelLoop AndroidTextFieldLoop HwpackLoop</label>
+  <label>IntegrationLoop AndroidLoop KernelLoop AndroidTextFieldLoop HwpackLoop CIJob</label>
   <nodeProperties/>
   <globalNodeProperties/>
-</hudson>
\ No newline at end of file
+</hudson>

=== modified file 'dashboard/frontend/api/api.py'
--- dashboard/frontend/api/api.py	2013-02-04 10:59:49 +0000
+++ dashboard/frontend/api/api.py	2013-02-11 15:46:21 +0000
@@ -16,9 +16,10 @@
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 from tastypie.resources import ModelResource
-from tastypie.authorization import DjangoAuthorization
-from tastypie.authentication import ApiKeyAuthentication
+from tastypie.authorization import DjangoAuthorization, Authorization
+from tastypie.authentication import ApiKeyAuthentication, Authentication
 from dashboard.frontend.models.loop import Loop
+from frontend.ci_job.models.ci_job import CIJob
 
 """
 Add API endpoint logic here. The documentation to do this can be found here:
@@ -54,3 +55,19 @@
         resource_name = 'loops'
         authorization = DjangoAuthorization()
         authentication = ApiKeyAuthentication()
+
+class CIJobResource(ModelResource):
+    class Meta:
+        """Returns a list of all loops."""
+        queryset = CIJob.objects.all()
+        resource_name = 'jobs'
+        list_allowed_methods = ['get', 'post']
+        detail_allowed_methods = ['get', 'post', 'put', 'delete']
+
+        #http://django-tastypie.readthedocs.org/en/latest/authorization.html
+        # Currently everyone who has an API key is equal. Suggest we tie this
+        # down using a custom Authorization class (see above link) so anyone
+        # can create and modify their own jobs, but only some users have
+        # the ability to delete and modify other users' jobs.
+        authorization = Authorization() #DjangoAuthorization()
+        authentication = ApiKeyAuthentication()

=== modified file 'dashboard/frontend/api/urls.py'
--- dashboard/frontend/api/urls.py	2013-02-04 17:55:49 +0000
+++ dashboard/frontend/api/urls.py	2013-02-11 15:46:21 +0000
@@ -7,6 +7,7 @@
 # Register new resources here (probably defined in api.py)
 v1_api.register(LoginTestResource())
 v1_api.register(LoopsResource())
+v1_api.register(CIJobResource())
 
 urlpatterns = patterns('',
    (r'^api/', include(v1_api.urls)),

=== added directory 'dashboard/frontend/ci_job'
=== added file 'dashboard/frontend/ci_job/__init__.py'
=== added directory 'dashboard/frontend/ci_job/migrations'
=== added file 'dashboard/frontend/ci_job/migrations/0001_initial.py'
--- dashboard/frontend/ci_job/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/migrations/0001_initial.py	2013-02-11 15:46:21 +0000
@@ -0,0 +1,60 @@
+# -*- coding: 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 'CIJob'
+        db.create_table('ci_job_cijob', (
+            ('loop_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['frontend.Loop'], unique=True, primary_key=True)),
+            ('vcs_url', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('vcs_branch', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('vcs_tag', self.gf('django.db.models.fields.CharField')(default='', max_length=255)),
+            ('file_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('class_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('run_when_ready', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('ci_job', ['CIJob'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'CIJob'
+        db.delete_table('ci_job_cijob')
+
+
+    models = {
+        'ci_job.cijob': {
+            'Meta': {'object_name': 'CIJob', '_ormbases': ['frontend.Loop']},
+            'class_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'file_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'loop_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['frontend.Loop']", 'unique': 'True', 'primary_key': 'True'}),
+            'run_when_ready': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'vcs_branch': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'vcs_tag': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'vcs_url': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'frontend.loop': {
+            'Meta': {'object_name': 'Loop'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_official': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_restricted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'lava_tests': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'next_loop': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'previous_loop'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['frontend.Loop']", 'blank': 'True', 'unique': 'True'}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['jenkinsserver.JenkinsServer']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'})
+        },
+        '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 = ['ci_job']
\ No newline at end of file

=== added file 'dashboard/frontend/ci_job/migrations/__init__.py'
=== added directory 'dashboard/frontend/ci_job/models'
=== added file 'dashboard/frontend/ci_job/models/__init__.py'
--- dashboard/frontend/ci_job/models/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/models/__init__.py	2013-02-11 15:46:21 +0000
@@ -0,0 +1,1 @@
+from frontend.ci_job.models.ci_job import *

=== added file 'dashboard/frontend/ci_job/models/ci_job.py'
--- dashboard/frontend/ci_job/models/ci_job.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/models/ci_job.py	2013-02-11 15:46:21 +0000
@@ -0,0 +1,107 @@
+# 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
+#from django.contrib.auth.models import User
+
+
+class CIJob(Loop):
+    """Defines the base class for a CI Job."""
+    class Meta:
+        app_label = 'ci_job'
+
+    vcs_url = models.CharField(max_length=255,
+                                   verbose_name='Configuration repository')
+    vcs_branch = models.CharField(max_length=255,
+                                     verbose_name='Configuration branch',
+                                     default='')
+    vcs_tag = models.CharField(max_length=255,
+                                  verbose_name='Configuration tag',
+                                  default='')
+    file_name = models.CharField(max_length=255,
+                                   verbose_name='Configuration file name')
+    class_name = models.CharField(max_length=255,
+                                    verbose_name='Configuration class name')
+    run_when_ready = models.BooleanField(default=False)
+
+    #job_owner = models.ForeignKey(User, editable=False,
+    #                              verbose_name='Job Owner')
+
+    def save(self, *args, **kwargs):
+        self.server = JenkinsServer.objects.get(id=1)
+        self.type = self.__class__.__name__
+        super(self.__class__, 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_loop(self)
+        except:
+            # TODO: Log error.
+            pass
+
+    def schedule_build(self, parameters=None):
+        parameters = {'parameter': [{'delay': '0'}]}
+        return super(self.__class__, self).schedule_build(parameters)
+
+    def base64_config(self,
+                      include=None,
+                      exclude=None,
+                      capitalize=False,
+                      upper=False):
+        exclude = ['id', 'server', 'loop_ptr', 'next_loop', 'name', 'type']
+        return super(CIJob, self).base64_config(include=include,
+                                                      exclude=exclude,
+                                                      capitalize=capitalize,
+                                                      upper=True)
+
+    def preconfigure(self, configuration=None):
+        """Makes a build parameter dict from build result configuration.
+
+        This method should be overridden by subclasses.
+        """
+        if isinstance(configuration, dict):
+            # The name is the name of the loop that is calling the chained one,
+            # not the one we want to actually configure, we drop it.
+            configuration.pop('name')
+            unmatched_values = u''
+            for key, value in configuration.iteritems():
+                if hasattr(self, key.lower()):
+                    setattr(self, key.lower(), value)
+                else:
+                    # If the attr cannot be found, we throw everything in
+                    # user_defined_values since the text field is free form.
+                    unmatched_values = u'%s=%s\n' % (key.upper(), str(value))
+
+            self.user_defined_values = unmatched_values
+            self.save()
+        else:
+            self.log.error("Parameter was not a 'dict' instance.")
+        return {}
+
+    @models.permalink
+    def get_detail_url(self):
+        return 'CIJobDetail', (), {'slug': self.name}
+
+    @models.permalink
+    def get_build_url(self):
+        return 'CIJobBuild', (), {'slug': self.name}
+
+    @models.permalink
+    def get_update_url(self):
+        return 'CIJobUpdate', (), {'slug': self.name}

=== added file 'dashboard/frontend/ci_job/urls.py'
--- dashboard/frontend/ci_job/urls.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/urls.py	2013-02-11 15:46:21 +0000
@@ -0,0 +1,31 @@
+# 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, url
+
+from frontend.ci_job.views.ci_job_detail_view \
+    import CIJobDetailView
+from frontend.ci_job.views.ci_job_build_view \
+    import CIJobBuildView
+
+
+urlpatterns = patterns('',
+    url(r'^ci_job/detail/(?P<slug>[\w|\W]+)/$',
+        CIJobDetailView.as_view(), name='CIJobDetail'),
+    url(r'^ci_job/build/(?P<slug>[\w|\W]+)/$',
+        CIJobBuildView.as_view(), name='CIJobBuild'),
+)

=== added directory 'dashboard/frontend/ci_job/views'
=== added file 'dashboard/frontend/ci_job/views/__init__.py'
=== added file 'dashboard/frontend/ci_job/views/ci_job_build_view.py'
--- dashboard/frontend/ci_job/views/ci_job_build_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/views/ci_job_build_view.py	2013-02-11 15:46:21 +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.ci_job.models.ci_job import CIJob
+from frontend.views.loop_build_view import LoopBuildView
+
+
+class CIJobBuildView(LoopBuildView):
+
+    model = CIJob

=== added file 'dashboard/frontend/ci_job/views/ci_job_detail_view.py'
--- dashboard/frontend/ci_job/views/ci_job_detail_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/ci_job/views/ci_job_detail_view.py	2013-02-11 15:46:21 +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.ci_job.models.ci_job import CIJob
+from frontend.views.loop_detail_view import LoopDetailView
+
+
+class CIJobDetailView(LoopDetailView):
+
+    model = CIJob

=== modified file 'dashboard/frontend/models/loop_reference.py'
--- dashboard/frontend/models/loop_reference.py	2012-09-18 12:16:59 +0000
+++ dashboard/frontend/models/loop_reference.py	2013-02-11 15:46:21 +0000
@@ -23,3 +23,4 @@
 INTEGRATION_LOOP = ('IntegrationLoop')
 ANDROID_TEXTFIELD_LOOP = ('AndroidTextFieldLoop')
 HWPACK_LOOP = ('HwpackLoop')
+CI_JOB = ('CIJob')

=== modified file 'dashboard/frontend/tests/test_api.py'
--- dashboard/frontend/tests/test_api.py	2013-02-04 17:55:49 +0000
+++ dashboard/frontend/tests/test_api.py	2013-02-11 15:46:21 +0000
@@ -20,8 +20,10 @@
 from tastypie.models import ApiKey
 from dashboard.frontend.models.loop import Loop
 from dashboard.frontend.android_build.models.android_loop import AndroidLoop
+from dashboard.frontend.ci_job.models.ci_job import CIJob
 import requests
 from urlparse import urljoin
+import simplejson
 
 
 class ApiTests(LiveServerTestCase):
@@ -32,13 +34,18 @@
     def setUp(self):
         super(ApiTests, self).setUp()
 
+        self.settings = {}
+        self.settings["ci_server"] = "http://localhost:8081"
+        self.settings["api_prefix"] = "/api/dev/"
+        self.settings["username"] = 'daniel'
+        self.settings["password"] = 'pass'
+        self.settings["api_key"] = "0"
+
         # Create a user.
-        self.username = 'daniel'
-        self.password = 'pass'
         self.user = User.objects.create_user(
-                        self.username, '[e-mail]', self.password)
-
-        self.api_key = "0"
+            self.settings["username"],
+            '[e-mail]',
+            self.settings["password"])
 
         # Add a couple of jobs to test against.
         self.android_loop = AndroidLoop()
@@ -51,16 +58,35 @@
         self.loop.type = Loop.__class__.__name__
         self.loop.save()
 
-    def get(self, url):
-        payload = {"username": self.username,
-                   "api_key": self.api_key,
-                   "format": "json"}
-        url = urljoin("http://localhost:8081", "/api/dev/" + url)
-        return requests.get(url, params=payload)
+    def get(self, url, in_params=None):
+        url, params = self._prep_request(url, in_params)
+        return requests.get(url, params=params)
+
+    def post(self, url, data, in_params=None):
+        url, params = self._prep_request(url, in_params)
+        return requests.post(url, data=data, params=params,
+                             headers={"content-type": "application/json"})
+
+    def _prep_request(self, url, in_params=None):
+        params = {"username": self.settings["username"],
+                  "api_key": self.settings["api_key"],
+                  "format": "json"}
+
+        url = urljoin(self.settings["ci_server"],
+                      self.settings["api_prefix"] + url)
+
+        # If we don't have a trailing slash, we will just be redirected. Avoid
+        # the extra call.
+        if url[-1] != "/":
+            url += "/"
+
+        if in_params:
+            params.update(in_params)
+
+        return url, params
 
     def login(self):
-        self.api_key = ApiKey.objects.create(user=self.user).key
-        #self.create_apikey(self.username, self.api_key)
+        self.settings["api_key"] = ApiKey.objects.create(user=self.user).key
 
     def test_login_test_unauthorzied(self):
         r = self.get("login_test")
@@ -93,3 +119,22 @@
         api_test_names = {json[0]['name'], json[1]['name']}
         test_names = {self.android_loop.name, self.loop.name}
         self.assertEqual(api_test_names, test_names)
+
+    def test_add_job(self):
+        self.login()
+        data = {
+            "vcs_url": "vcsurl",
+            "file_name": "filename",
+            "class_name": "classname",
+            "run": False,
+            "name": "jobname"
+        }
+        json_data = simplejson.dumps(data)
+
+        r = self.post("jobs", json_data, {})
+        self.assertEqual(r.status_code, requests.codes.created)
+
+        jobs = CIJob.objects.all()
+
+        self.assertEqual(len(jobs), 1)
+        self.assertEqual(jobs[0].name, data["name"])

=== modified file 'dashboard/frontend/views/index_view.py'
--- dashboard/frontend/views/index_view.py	2012-09-13 11:37:13 +0000
+++ dashboard/frontend/views/index_view.py	2013-02-11 15:46:21 +0000
@@ -25,6 +25,7 @@
 from frontend.android_textfield_loop.models.android_textfield_loop \
     import AndroidTextFieldLoop
 from frontend.hwpack_loop.models.hwpack_loop import HwpackLoop
+from frontend.ci_job.models.ci_job import CIJob
 
 class IndexView(TemplateView):
 
@@ -42,4 +43,5 @@
         context['kernel_loops'] = KernelLoop.objects.all()
         context['android_textfield_loops'] = AndroidTextFieldLoop.objects.all()
         context['hwpack_loops'] = HwpackLoop.objects.all()
+        context['ci_jobs'] = CIJob.objects.all()
         return context

=== modified file 'dashboard/settings.py'
--- dashboard/settings.py	2013-01-30 17:20:40 +0000
+++ dashboard/settings.py	2013-02-11 15:46:21 +0000
@@ -158,6 +158,7 @@
     'frontend.android_textfield_loop',
     'frontend.hwpack_loop',
     'frontend.api',
+    'frontend.ci_job',
     'tastypie',
     'south',
     # Uncomment the next line to enable admin documentation:

=== modified file 'dashboard/urls.py'
--- dashboard/urls.py	2013-01-21 16:16:03 +0000
+++ dashboard/urls.py	2013-02-11 15:46:21 +0000
@@ -40,4 +40,5 @@
     url(r'^', include('dashboard.frontend.android_textfield_loop.urls')),
     url(r'^', include('dashboard.frontend.hwpack_loop.urls')),
     url(r'^', include('dashboard.frontend.api.urls')),
+    url(r'^', include('dashboard.frontend.ci_job.urls')),
 )

=== modified file 'requirements.txt'
--- requirements.txt	2013-02-01 11:39:17 +0000
+++ requirements.txt	2013-02-11 15:46:21 +0000
@@ -12,4 +12,5 @@
 python-jenkins==0.2
 python-openid==2.2.5
 requests==1.1.0
+simplejson==3.0.7
 wsgiref==0.1.2