Merge lp:~allanlesage/helipad/kill-jenkinsrun into lp:helipad/ci

[Chris Johnston]

Eliminate JenkinsRun.

While we were re-rolling the initial migration cjohnston suggested getting rid of JenkinsRun; fginther confirmed that we're no longer doing the multi-configuration builds at all and no longer need to support JenkinsRuns; this branch eliminates and fixes relevant tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://s-jenkins:8080/job/helipad-ci-ci/58/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/58/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

LGTM

review: Approve

[Chris Johnston (cjohnston)]

Conflicts

review: Needs Fixing

[lp:~allanlesage/helipad/kill-jenkinsrun]

40. By Allan LeSage on 2013-08-07

Merge trunk, resolving migration conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:40
http://s-jenkins:8080/job/helipad-ci-ci/62/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[lp:~allanlesage/helipad/kill-jenkinsrun]

41. By Allan LeSage on 2013-08-07

Re-removed last_build members from migration.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:41
http://s-jenkins:8080/job/helipad-ci-ci/63/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'admin.py'
--- admin.py	2013-07-16 17:11:09 +0000
+++ admin.py	2013-08-07 23:29:27 +0000
@@ -16,7 +16,6 @@
 from ci.models import (CiProject,
                        JenkinsJob,
                        JenkinsBuild,
-                       JenkinsRun,
                        JenkinsTestReport,
                        JenkinsCoverageReport,
                        JenkinsFlavor,
@@ -45,9 +44,6 @@
     list_display = ('url',)
     filter_horizontal = ("downstream_builds",)
 
-class JenkinsRunAdmin(admin.ModelAdmin):
-    list_display = ('url',)
-
 class JenkinsFlavorAdmin(admin.ModelAdmin):
     list_display = ('name',)
 
@@ -66,7 +62,6 @@
 admin.site.register(CiProject, CiProjectAdmin)
 admin.site.register(JenkinsJob, JenkinsJobAdmin)
 admin.site.register(JenkinsBuild, JenkinsBuildAdmin)
-admin.site.register(JenkinsRun, JenkinsRunAdmin)
 admin.site.register(JenkinsFlavor, JenkinsFlavorAdmin)
 admin.site.register(Series, SeriesAdmin)
 admin.site.register(JenkinsResult, JenkinsResultAdmin)

=== added file 'migrations/0001_initial.py'
--- migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ migrations/0001_initial.py	2013-08-07 23:29:27 +0000
@@ -0,0 +1,250 @@
+# -*- 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 'JenkinsJob'
+        db.create_table('ci_jenkinsjob', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=256)),
+            ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+            ('project', self.gf('django.db.models.fields.related.ForeignKey')(related_name='jenkins_jobs', null=True, to=orm['ci.CiProject'])),
+            ('upstream_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='downstream_jobs', null=True, to=orm['ci.JenkinsJob'])),
+            ('buildable', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('in_queue', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('ci', ['JenkinsJob'])
+
+        # Adding model 'CiProject'
+        db.create_table('ci_ciproject', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=256)),
+            ('release', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Release'], null=True)),
+            ('stack', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Cu2dStack'], null=True)),
+            ('ci_primary_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='ci_primary', null=True, to=orm['ci.JenkinsJob'])),
+            ('autolanding_primary_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='autolanding_primary', null=True, to=orm['ci.JenkinsJob'])),
+            ('launchpad_project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.LaunchpadProject'], null=True)),
+        ))
+        db.send_create_signal('ci', ['CiProject'])
+
+        # Adding model 'LaunchpadProject'
+        db.create_table('ci_launchpadproject', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=256)),
+        ))
+        db.send_create_signal('ci', ['LaunchpadProject'])
+
+        # Adding model 'Cu2dStack'
+        db.create_table('ci_cu2dstack', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+            ('series', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Series'], null=True)),
+            ('ppa', self.gf('django.db.models.fields.CharField')(max_length=64, null=True)),
+            ('release', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Release'], null=True)),
+            ('integration_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='integration', null=True, to=orm['ci.JenkinsJob'])),
+        ))
+        db.send_create_signal('ci', ['Cu2dStack'])
+
+        # Adding model 'JenkinsTestReport'
+        db.create_table('ci_jenkinstestreport', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('fail_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('pass_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('skip_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('duration', self.gf('django.db.models.fields.IntegerField')()),
+        ))
+        db.send_create_signal('ci', ['JenkinsTestReport'])
+
+        # Adding model 'JenkinsCoverageReport'
+        db.create_table('ci_jenkinscoveragereport', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('jenkins_build', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsBuild'], unique=True, null=True)),
+            ('line_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('hit_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('branch_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('taken_count', self.gf('django.db.models.fields.IntegerField')()),
+            ('total_count', self.gf('django.db.models.fields.IntegerField')()),
+        ))
+        db.send_create_signal('ci', ['JenkinsCoverageReport'])
+
+        # Adding model 'JenkinsFlavor'
+        db.create_table('ci_jenkinsflavor', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+        ))
+        db.send_create_signal('ci', ['JenkinsFlavor'])
+
+        # Adding model 'Release'
+        db.create_table('ci_release', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+        ))
+        db.send_create_signal('ci', ['Release'])
+
+        # Adding model 'Series'
+        db.create_table('ci_series', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+        ))
+        db.send_create_signal('ci', ['Series'])
+
+        # Adding model 'JenkinsResult'
+        db.create_table('ci_jenkinsresult', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+        ))
+        db.send_create_signal('ci', ['JenkinsResult'])
+
+        # Adding model 'JenkinsBuild'
+        db.create_table('ci_jenkinsbuild', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('jenkins_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='builds', null=True, to=orm['ci.JenkinsJob'])),
+            ('number', self.gf('django.db.models.fields.IntegerField')()),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')()),
+            ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)),
+            ('result', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsResult'])),
+            ('coverage_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsCoverageReport'], null=True)),
+            ('test_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsTestReport'], null=True)),
+        ))
+        db.send_create_signal('ci', ['JenkinsBuild'])
+
+        # Adding M2M table for field downstream_builds on 'JenkinsBuild'
+        db.create_table('ci_jenkinsbuild_downstream_builds', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('from_jenkinsbuild', models.ForeignKey(orm['ci.jenkinsbuild'], null=False)),
+            ('to_jenkinsbuild', models.ForeignKey(orm['ci.jenkinsbuild'], null=False))
+        ))
+        db.create_unique('ci_jenkinsbuild_downstream_builds', ['from_jenkinsbuild_id', 'to_jenkinsbuild_id'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'JenkinsJob'
+        db.delete_table('ci_jenkinsjob')
+
+        # Deleting model 'CiProject'
+        db.delete_table('ci_ciproject')
+
+        # Deleting model 'LaunchpadProject'
+        db.delete_table('ci_launchpadproject')
+
+        # Deleting model 'Cu2dStack'
+        db.delete_table('ci_cu2dstack')
+
+        # Deleting model 'JenkinsTestReport'
+        db.delete_table('ci_jenkinstestreport')
+
+        # Deleting model 'JenkinsCoverageReport'
+        db.delete_table('ci_jenkinscoveragereport')
+
+        # Deleting model 'JenkinsFlavor'
+        db.delete_table('ci_jenkinsflavor')
+
+        # Deleting model 'Release'
+        db.delete_table('ci_release')
+
+        # Deleting model 'Series'
+        db.delete_table('ci_series')
+
+        # Deleting model 'JenkinsResult'
+        db.delete_table('ci_jenkinsresult')
+
+        # Deleting model 'JenkinsBuild'
+        db.delete_table('ci_jenkinsbuild')
+
+        # Removing M2M table for field downstream_builds on 'JenkinsBuild'
+        db.delete_table('ci_jenkinsbuild_downstream_builds')
+
+
+    models = {
+        'ci.ciproject': {
+            'Meta': {'object_name': 'CiProject'},
+            'autolanding_primary_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'autolanding_primary'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
+            'ci_primary_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ci_primary'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'launchpad_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.LaunchpadProject']", 'null': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'release': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Release']", 'null': 'True'}),
+            'stack': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Cu2dStack']", 'null': 'True'})
+        },
+        'ci.cu2dstack': {
+            'Meta': {'object_name': 'Cu2dStack'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'integration_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'integration'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'ppa': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
+            'release': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Release']", 'null': 'True'}),
+            'series': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Series']", 'null': 'True'})
+        },
+        'ci.jenkinsbuild': {
+            'Meta': {'object_name': 'JenkinsBuild'},
+            'coverage_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsCoverageReport']", 'null': 'True'}),
+            'downstream_builds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ci.JenkinsBuild']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jenkins_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'builds'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
+            'number': ('django.db.models.fields.IntegerField', [], {}),
+            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsResult']"}),
+            'test_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsTestReport']", 'null': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
+            'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        'ci.jenkinscoveragereport': {
+            'Meta': {'object_name': 'JenkinsCoverageReport'},
+            'branch_count': ('django.db.models.fields.IntegerField', [], {}),
+            'hit_count': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jenkins_build': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsBuild']", 'unique': 'True', 'null': 'True'}),
+            'line_count': ('django.db.models.fields.IntegerField', [], {}),
+            'taken_count': ('django.db.models.fields.IntegerField', [], {}),
+            'total_count': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'ci.jenkinsflavor': {
+            'Meta': {'object_name': 'JenkinsFlavor'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'ci.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob'},
+            'buildable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'in_queue': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'jenkins_jobs'", 'null': 'True', 'to': "orm['ci.CiProject']"}),
+            'upstream_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'downstream_jobs'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'ci.jenkinsresult': {
+            'Meta': {'object_name': 'JenkinsResult'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'ci.jenkinstestreport': {
+            'Meta': {'object_name': 'JenkinsTestReport'},
+            'duration': ('django.db.models.fields.IntegerField', [], {}),
+            'fail_count': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pass_count': ('django.db.models.fields.IntegerField', [], {}),
+            'skip_count': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'ci.launchpadproject': {
+            'Meta': {'object_name': 'LaunchpadProject'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'ci.release': {
+            'Meta': {'object_name': 'Release'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'ci.series': {
+            'Meta': {'object_name': 'Series'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        }
+    }
+
+    complete_apps = ['ci']

=== removed file 'migrations/0001_initial.py'
--- migrations/0001_initial.py	2013-08-01 19:02:22 +0000
+++ migrations/0001_initial.py	1970-01-01 00:00:00 +0000
@@ -1,285 +0,0 @@
-# -*- 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 'JenkinsJob'
-        db.create_table('ci_jenkinsjob', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=256)),
-            ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
-            ('project', self.gf('django.db.models.fields.related.ForeignKey')(related_name='jenkins_jobs', null=True, to=orm['ci.CiProject'])),
-            ('upstream_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='downstream_jobs', null=True, to=orm['ci.JenkinsJob'])),
-            ('buildable', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('in_queue', self.gf('django.db.models.fields.BooleanField')(default=False)),
-        ))
-        db.send_create_signal('ci', ['JenkinsJob'])
-
-        # Adding model 'CiProject'
-        db.create_table('ci_ciproject', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=256)),
-            ('release', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Release'], null=True)),
-            ('stack', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Cu2dStack'], null=True)),
-            ('ci_primary_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='ci_primary', null=True, to=orm['ci.JenkinsJob'])),
-            ('autolanding_primary_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='autolanding_primary', null=True, to=orm['ci.JenkinsJob'])),
-            ('launchpad_project', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.LaunchpadProject'], null=True)),
-        ))
-        db.send_create_signal('ci', ['CiProject'])
-
-        # Adding model 'LaunchpadProject'
-        db.create_table('ci_launchpadproject', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=256)),
-        ))
-        db.send_create_signal('ci', ['LaunchpadProject'])
-
-        # Adding model 'Cu2dStack'
-        db.create_table('ci_cu2dstack', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('series', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Series'], null=True)),
-            ('ppa', self.gf('django.db.models.fields.CharField')(max_length=64, null=True)),
-            ('release', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Release'], null=True)),
-            ('integration_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='integration', null=True, to=orm['ci.JenkinsJob'])),
-        ))
-        db.send_create_signal('ci', ['Cu2dStack'])
-
-        # Adding model 'JenkinsTestReport'
-        db.create_table('ci_jenkinstestreport', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('fail_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('pass_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('skip_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('duration', self.gf('django.db.models.fields.IntegerField')()),
-        ))
-        db.send_create_signal('ci', ['JenkinsTestReport'])
-
-        # Adding model 'JenkinsCoverageReport'
-        db.create_table('ci_jenkinscoveragereport', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('jenkins_build', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsBuild'], unique=True, null=True)),
-            ('line_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('hit_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('branch_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('taken_count', self.gf('django.db.models.fields.IntegerField')()),
-            ('total_count', self.gf('django.db.models.fields.IntegerField')()),
-        ))
-        db.send_create_signal('ci', ['JenkinsCoverageReport'])
-
-        # Adding model 'JenkinsFlavor'
-        db.create_table('ci_jenkinsflavor', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal('ci', ['JenkinsFlavor'])
-
-        # Adding model 'Release'
-        db.create_table('ci_release', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal('ci', ['Release'])
-
-        # Adding model 'Series'
-        db.create_table('ci_series', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal('ci', ['Series'])
-
-        # Adding model 'JenkinsResult'
-        db.create_table('ci_jenkinsresult', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal('ci', ['JenkinsResult'])
-
-        # Adding model 'JenkinsRun'
-        db.create_table('ci_jenkinsrun', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('jenkins_build', self.gf('django.db.models.fields.related.ForeignKey')(related_name='runs', null=True, to=orm['ci.JenkinsBuild'])),
-            ('number', self.gf('django.db.models.fields.IntegerField')(null=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=256)),
-            ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)),
-            ('duration', self.gf('django.db.models.fields.IntegerField')()),
-            ('flavor', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsFlavor'])),
-            ('series', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.Series'])),
-            ('result', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsResult'])),
-            ('coverage_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsCoverageReport'], null=True)),
-            ('test_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsTestReport'], null=True)),
-            ('timestamp', self.gf('django.db.models.fields.DateTimeField')()),
-        ))
-        db.send_create_signal('ci', ['JenkinsRun'])
-
-        # Adding model 'JenkinsBuild'
-        db.create_table('ci_jenkinsbuild', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('jenkins_job', self.gf('django.db.models.fields.related.ForeignKey')(related_name='builds', null=True, to=orm['ci.JenkinsJob'])),
-            ('number', self.gf('django.db.models.fields.IntegerField')()),
-            ('timestamp', self.gf('django.db.models.fields.DateTimeField')()),
-            ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)),
-            ('result', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsResult'])),
-            ('coverage_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsCoverageReport'], null=True)),
-            ('test_report', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ci.JenkinsTestReport'], null=True)),
-        ))
-        db.send_create_signal('ci', ['JenkinsBuild'])
-
-        # Adding M2M table for field downstream_builds on 'JenkinsBuild'
-        db.create_table('ci_jenkinsbuild_downstream_builds', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('from_jenkinsbuild', models.ForeignKey(orm['ci.jenkinsbuild'], null=False)),
-            ('to_jenkinsbuild', models.ForeignKey(orm['ci.jenkinsbuild'], null=False))
-        ))
-        db.create_unique('ci_jenkinsbuild_downstream_builds', ['from_jenkinsbuild_id', 'to_jenkinsbuild_id'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'JenkinsJob'
-        db.delete_table('ci_jenkinsjob')
-
-        # Deleting model 'CiProject'
-        db.delete_table('ci_ciproject')
-
-        # Deleting model 'LaunchpadProject'
-        db.delete_table('ci_launchpadproject')
-
-        # Deleting model 'Cu2dStack'
-        db.delete_table('ci_cu2dstack')
-
-        # Deleting model 'JenkinsTestReport'
-        db.delete_table('ci_jenkinstestreport')
-
-        # Deleting model 'JenkinsCoverageReport'
-        db.delete_table('ci_jenkinscoveragereport')
-
-        # Deleting model 'JenkinsFlavor'
-        db.delete_table('ci_jenkinsflavor')
-
-        # Deleting model 'Release'
-        db.delete_table('ci_release')
-
-        # Deleting model 'Series'
-        db.delete_table('ci_series')
-
-        # Deleting model 'JenkinsResult'
-        db.delete_table('ci_jenkinsresult')
-
-        # Deleting model 'JenkinsRun'
-        db.delete_table('ci_jenkinsrun')
-
-        # Deleting model 'JenkinsBuild'
-        db.delete_table('ci_jenkinsbuild')
-
-        # Removing M2M table for field downstream_builds on 'JenkinsBuild'
-        db.delete_table('ci_jenkinsbuild_downstream_builds')
-
-
-    models = {
-        'ci.ciproject': {
-            'Meta': {'object_name': 'CiProject'},
-            'autolanding_primary_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'autolanding_primary'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
-            'ci_primary_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ci_primary'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'launchpad_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.LaunchpadProject']", 'null': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
-            'release': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Release']", 'null': 'True'}),
-            'stack': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Cu2dStack']", 'null': 'True'})
-        },
-        'ci.cu2dstack': {
-            'Meta': {'object_name': 'Cu2dStack'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'integration_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'integration'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'ppa': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}),
-            'release': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Release']", 'null': 'True'}),
-            'series': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Series']", 'null': 'True'})
-        },
-        'ci.jenkinsbuild': {
-            'Meta': {'object_name': 'JenkinsBuild'},
-            'coverage_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsCoverageReport']", 'null': 'True'}),
-            'downstream_builds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ci.JenkinsBuild']", 'symmetrical': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'jenkins_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'builds'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
-            'number': ('django.db.models.fields.IntegerField', [], {}),
-            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsResult']"}),
-            'test_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsTestReport']", 'null': 'True'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'})
-        },
-        'ci.jenkinscoveragereport': {
-            'Meta': {'object_name': 'JenkinsCoverageReport'},
-            'branch_count': ('django.db.models.fields.IntegerField', [], {}),
-            'hit_count': ('django.db.models.fields.IntegerField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'jenkins_build': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsBuild']", 'unique': 'True', 'null': 'True'}),
-            'line_count': ('django.db.models.fields.IntegerField', [], {}),
-            'taken_count': ('django.db.models.fields.IntegerField', [], {}),
-            'total_count': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'ci.jenkinsflavor': {
-            'Meta': {'object_name': 'JenkinsFlavor'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        'ci.jenkinsjob': {
-            'Meta': {'object_name': 'JenkinsJob'},
-            'buildable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'in_queue': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
-            'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'jenkins_jobs'", 'null': 'True', 'to': "orm['ci.CiProject']"}),
-            'upstream_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'downstream_jobs'", 'null': 'True', 'to': "orm['ci.JenkinsJob']"}),
-            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
-        },
-        'ci.jenkinsresult': {
-            'Meta': {'object_name': 'JenkinsResult'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        'ci.jenkinsrun': {
-            'Meta': {'object_name': 'JenkinsRun'},
-            'coverage_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsCoverageReport']", 'null': 'True'}),
-            'duration': ('django.db.models.fields.IntegerField', [], {}),
-            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsFlavor']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'jenkins_build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'runs'", 'null': 'True', 'to': "orm['ci.JenkinsBuild']"}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'number': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
-            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsResult']"}),
-            'series': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.Series']"}),
-            'test_report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ci.JenkinsTestReport']", 'null': 'True'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200'})
-        },
-        'ci.jenkinstestreport': {
-            'Meta': {'object_name': 'JenkinsTestReport'},
-            'duration': ('django.db.models.fields.IntegerField', [], {}),
-            'fail_count': ('django.db.models.fields.IntegerField', [], {}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'pass_count': ('django.db.models.fields.IntegerField', [], {}),
-            'skip_count': ('django.db.models.fields.IntegerField', [], {})
-        },
-        'ci.launchpadproject': {
-            'Meta': {'object_name': 'LaunchpadProject'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'ci.release': {
-            'Meta': {'object_name': 'Release'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        'ci.series': {
-            'Meta': {'object_name': 'Series'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        }
-    }
-
-    complete_apps = ['ci']
\ No newline at end of file

=== modified file 'models.py'
--- models.py	2013-08-07 22:49:36 +0000
+++ models.py	2013-08-07 23:29:27 +0000
@@ -439,26 +439,6 @@
         return self.name
 
 
-class JenkinsRun(models.Model):
-
-    jenkins_build = models.ForeignKey('JenkinsBuild',
-                                      related_name='runs',
-                                      null=True)
-    number = models.IntegerField(null=True)
-    name = models.CharField(max_length=256)
-    url = models.URLField(unique=True)
-    duration = models.IntegerField() # seconds
-    flavor = models.ForeignKey('JenkinsFlavor')
-    series = models.ForeignKey('Series')
-    result = models.ForeignKey('JenkinsResult')
-    coverage_report = models.ForeignKey('JenkinsCoverageReport', null=True)
-    test_report = models.ForeignKey('JenkinsTestReport', null=True)
-    timestamp = models.DateTimeField()
-
-    def __unicode__(self):
-        return self.name
-
-
 class JenkinsBuild(models.Model):
     """A Jenkins build."""
 

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2013-07-25 00:00:00 +0000
+++ tests/unit/__init__.py	2013-08-07 23:29:27 +0000
@@ -27,8 +27,6 @@
 from test_jenkins_job_import import *
 from test_jenkins_job import *
 from test_jenkins_result import *
-from test_jenkins_run_import import *
-from test_jenkins_run import *
 from test_jenkins_test_report_import import *
 from test_launchpad_project_import import *
 from test_launchpad_project import *

=== modified file 'tests/unit/test_jenkins_build_import.py'
--- tests/unit/test_jenkins_build_import.py	2013-07-26 01:50:54 +0000
+++ tests/unit/test_jenkins_build_import.py	2013-08-07 23:29:27 +0000
@@ -45,9 +45,6 @@
 
     def setUp(self):
         super(TestCreateFromUrl, self).setUp()
-        self.create_downstream_runs_patch = patch(
-            'ci.util.jenkins_build.create_downstream_runs')
-        self.create_downstream_runs_patch.start()
         self.create_downstream_builds_patch = patch(
             'ci.util.jenkins_build.create_downstream_builds')
         self.create_downstream_builds_patch.start()
@@ -65,7 +62,6 @@
         self.aggregate_test_report_patch.start()
 
     def tearDown(self):
-        self.create_downstream_runs_patch.stop()
         self.create_downstream_builds_patch.stop()
         self.create_cobertura_report_patch.stop()
         self.create_jenkins_test_report_patch.stop()

=== removed file 'tests/unit/test_jenkins_run.py'
--- tests/unit/test_jenkins_run.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_jenkins_run.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3, as
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from mock import MagicMock, patch
-from django.test import TestCase
-from django.db import IntegrityError
-from ci.models import JenkinsRun
-import ci.util.extractor as extractor
-
-
-class TestJenkinsRun(TestCase):
-
-    def setUp(self):
-        jenkins_run_mock = MagicMock(
-            spec=JenkinsRun,
-            return_value=None)
-        self.jenkins_run_patch = patch.object(
-            JenkinsRun,
-            '__init__',
-            new=jenkins_run_mock)
-        self.jenkins_run_patch.start()
-        self.jenkins_run = \
-            JenkinsRun()
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
-
-    def tearDown(self):
-        self.jenkins_run_patch.stop()
-        self.logger_patch.stop()
-
-    def test_unicode(self):
-        self.jenkins_run.name = 'indicator-sync-i386-raring-autolanding'
-        self.assertEqual('indicator-sync-i386-raring-autolanding',
-                         str(self.jenkins_run))

=== removed file 'tests/unit/test_jenkins_run_import.py'
--- tests/unit/test_jenkins_run_import.py	2013-07-16 17:29:47 +0000
+++ tests/unit/test_jenkins_run_import.py	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-# QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3, as
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from mock import MagicMock, patch
-from django.test import TestCase
-from django.db import IntegrityError
-from ci.models import JenkinsJob, JenkinsRun
-import ci.util.extractor as extractor
-from ci.util.jenkins_run import create_jenkins_run_from_url
-
-
-class TestCreateFromUrl(TestCase):
-
-    def setUp(self):
-        self.logger_patch = patch('ci.models.logger')
-        self.logger_patch.start()
-        self.fake_url = "http://this.string.is.actually.a.URL/no/kidding"
-        self.fake_jenkins_build = "a Django representation of a Jenkins job"
-
-    def tearDown(self):
-        self.logger_patch.stop()
-
-    def test_vanilla(self):
-        extractor_jenkins_run = MagicMock()
-        jenkins_flavor_get_or_create = MagicMock(return_value=(
-                'fake_jenkins_flavor', False))
-        series_get_or_create = MagicMock(return_value=(
-                'fake_series', False))
-        jenkins_result_get_or_create = MagicMock(return_value=(
-                'fake_jenkins_result', False))
-        with patch('ci.util.extractor.JenkinsRun', extractor_jenkins_run), \
-                patch('ci.models.JenkinsFlavor.objects.get_or_create',
-                      jenkins_flavor_get_or_create), \
-                patch('ci.models.Series.objects.get_or_create',
-                      series_get_or_create), \
-                patch('ci.models.JenkinsResult.objects.get_or_create',
-                      jenkins_result_get_or_create), \
-                patch('ci.models.JenkinsRun.objects.create') as jenkins_run_objects_create:
-            extractor_jenkins_run.return_value.number = 42
-            extractor_jenkins_run.return_value.name = 'fake_jenkins_run_name'
-            duration_mock = MagicMock()
-            duration_mock.seconds = 3.1415
-            extractor_jenkins_run.return_value.duration = duration_mock
-            extractor_jenkins_run.return_value.timestamp = 'fake_timestamp'
-            extractor_jenkins_run.return_value.parameters = 'fake_parameters'
-            result = create_jenkins_run_from_url(
-                self.fake_url, self.fake_jenkins_build)
-        jenkins_run_objects_create.assert_called_with(
-            jenkins_build=self.fake_jenkins_build,
-            number=42,
-            name='fake_jenkins_run_name',
-            url=self.fake_url,
-            duration=3.1415,
-            timestamp='fake_timestamp',
-            flavor='fake_jenkins_flavor',
-            series='fake_series',
-            result='fake_jenkins_result')
-
-    def test_extractor_build_result_is_none(self):
-        """Weird but extractor returns None for result b/c no runs at all."""
-
-        self.fake_url = "http://this.string.is.actually.a.URL/no/kidding"
-        self.fake_jenkins_build = "a Django representation of a Jenkins build"
-        extractor_jenkins_run = MagicMock()
-        jenkins_flavor_get_or_create = MagicMock(return_value=(
-                'fake_jenkins_flavor', False))
-        series_get_or_create = MagicMock(return_value=(
-                'fake_series', False))
-        jenkins_result_get_or_create = MagicMock(side_effect=IntegrityError)
-        with patch('ci.util.extractor.JenkinsRun', extractor_jenkins_run), \
-                patch('ci.models.JenkinsFlavor.objects.get_or_create',
-                      jenkins_flavor_get_or_create), \
-                patch('ci.models.Series.objects.get_or_create', series_get_or_create), \
-                patch('ci.models.JenkinsResult.objects.get_or_create', jenkins_result_get_or_create), \
-                patch('ci.models.JenkinsRun.objects.create') as jenkins_run_objects_create:
-            result = create_jenkins_run_from_url(
-                self.fake_url, self.fake_jenkins_build)
-        self.assertIsNone(result)
-
-    def test_run_duplicate_integrity_error(self):
-        self.fake_url = "http://this.string.is.actually.a.URL/no/kidding"
-        self.fake_jenkins_build = "a Django representation of a Jenkins job"
-        extractor_jenkins_run = MagicMock()
-        jenkins_flavor_get_or_create = MagicMock(return_value=(
-                'fake_jenkins_flavor', False))
-        series_get_or_create = MagicMock(return_value=(
-                'fake_series', False))
-        jenkins_result_get_or_create = MagicMock(return_value=(
-                'fake_jenkins_result', False))
-        with patch('ci.util.extractor.JenkinsRun', extractor_jenkins_run), \
-                patch('ci.models.JenkinsFlavor.objects.get_or_create',
-                      jenkins_flavor_get_or_create), \
-                patch('ci.models.Series.objects.get_or_create',
-                      series_get_or_create), \
-                patch('ci.models.JenkinsResult.objects.get_or_create',
-                      jenkins_result_get_or_create), \
-                patch('ci.models.JenkinsRun.objects.create') as jenkins_run_objects_create:
-            jenkins_run_objects_create.side_effect = IntegrityError
-            extractor_jenkins_run.return_value.number = 42
-            extractor_jenkins_run.return_value.name = 'fake_jenkins_run_name'
-            duration_mock = MagicMock()
-            duration_mock.seconds = 3.1415
-            extractor_jenkins_run.return_value.duration = duration_mock
-            extractor_jenkins_run.return_value.timestamp = 'fake_timestamp'
-            extractor_jenkins_run.return_value.parameters = 'fake_parameters'
-            result = create_jenkins_run_from_url(
-                self.fake_url, self.fake_jenkins_build)
-        jenkins_run_objects_create.assert_called_with(
-            jenkins_build=self.fake_jenkins_build,
-            number=42,
-            name='fake_jenkins_run_name',
-            url=self.fake_url,
-            duration=3.1415,
-            timestamp='fake_timestamp',
-            flavor='fake_jenkins_flavor',
-            series='fake_series',
-            result='fake_jenkins_result')
-        self.assertIsNone(result)

=== modified file 'util/jenkins_build.py'
--- util/jenkins_build.py	2013-07-20 19:28:08 +0000
+++ util/jenkins_build.py	2013-08-07 23:29:27 +0000
@@ -23,7 +23,6 @@
 import ci.util.extractor as extractor
 from ci.util.coverage_report import create_coverage_report_from_url
 from ci.util.jenkins_test_report import create_jenkins_test_report_from_url
-from ci.util.jenkins_run import create_jenkins_run_from_url
 
 logger = logging.getLogger('qa_dashboard')
 
@@ -81,15 +80,6 @@
     ci_jenkins_build.save()
 
 
-# FIXME: restore support for multi-configuration builds
-def create_downstream_runs(ci_jenkins_build, extractor_build):
-    logger.debug("importing runs associated with JenkinsBuild at {}".format(extractor_build.url))
-    for run in extractor_build.runs:
-        pass
-        # FIXME: retore this, it breaks within
-        #jenkins_run = create_jenkins_run_from_url(run.url,
-        #                                          ci_jenkins_build)
-
 def create_cobertura_report(jenkins_build, extractor_build):
     """Get a Cobertura coverage report associated with a build url.
     
@@ -248,7 +238,6 @@
         logger.info("Duplicate Jenkins build found at {}".format(url))
         return None
 
-    create_downstream_runs(jenkins_build, extractor_build)
     create_downstream_builds(jenkins_build, extractor_build)
     create_cobertura_report(jenkins_build, extractor_build)
     create_jenkins_test_report(jenkins_build, extractor_build)

=== removed file 'util/jenkins_run.py'
--- util/jenkins_run.py	2013-07-16 17:29:47 +0000
+++ util/jenkins_run.py	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-# QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License version 3, as
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-from django.db import IntegrityError, transaction
-from ci.models import (JenkinsFlavor,
-                         JenkinsRun,
-                         Series,
-                         JenkinsResult)
-import ci.util.extractor as extractor
-
-logger = logging.getLogger("qa_dashboard")
-
-
-def create_jenkins_run_from_url(url, jenkins_build):
-    extractor_run = extractor.JenkinsRun(url)
-    flavor, created = JenkinsFlavor.objects.get_or_create(name=extractor_run.flavor)
-    series, created = Series.objects.get_or_create(name=extractor_run.series)
-    try:
-        result, created = JenkinsResult.objects.get_or_create(name=extractor_run.result)
-    except IntegrityError, e:
-        # no builds yet, IntegrityError on None name
-        transaction.rollback()
-        return None
-    try:
-        logger.debug("creating JenkinsRun at {}".format(url))
-        jenkins_run = JenkinsRun.objects.create(
-            jenkins_build=jenkins_build,
-            number=extractor_run.number,
-            name=extractor_run.name,
-            url=url,
-            duration=extractor_run.duration.seconds,
-            timestamp=extractor_run.timestamp,
-            flavor=flavor,
-            series=series,
-            result=result)
-    except IntegrityError:
-        transaction.rollback()
-        logger.debug("Duplicate Jenkins run found at {}.".format(url))
-        # TODO make it possible to update a run
-        return None
-    except TypeError, e:
-        logger.debug("Error creating JenkinsRun: {}".format(e))
-        return None
-    # Disabling this until we have a JenkinsRun-specific JenkinsReport create
-    #logger.debug("Importing coverage reports associated with JenkinsRun at {}.".format(url))
-    # TODO FJG Fix this
-    #try:
-    #    jenkins_run.coverage_report = JenkinsCoverageReport.objects.create(
-    #        # FIXME: restore
-    #        # run = jenkins_run,
-    #        xml_text=extractor_run.coverage_report.xml_text,
-    #        line_rate=extractor_run.coverage_report.line_rate,
-    #        branch_rate=extractor_run.coverage_report.branch_rate)
-    #    jenkins_run.save()
-    #except EnvironmentError:
-    #    # no data was found at the coverage report url
-    #    pass
-    #logger.debug("importing test reports associated with JenkinsRun at {}".format(url))
-    #try:
-    #    jenkins_run.test_report = JenkinsTestReport.objects.create(
-    #        fail_count=extractor_run.test_report.fail_count,
-    #        pass_count=extractor_run.test_report.pass_count,
-    #        skip_count=extractor_run.test_report.skip_count,
-    #        duration=extractor_run.test_report.duration.seconds)
-    #    jenkins_run.save()
-    #except EnvironmentError:
-    #    # no data was found at the test report url
-    #    pass
-    #except EnvironmentError, e:
-    #    logger.error(e)
-    return jenkins_run