fixes for production deployment

4 files changed, 3 insertions, 58 deletions

diff --git a/helpers/jenkins_lava.py b/helpers/jenkins_lava.py
index c38fc33..aa12a99 100644
--- a/helpers/jenkins_lava.py
+++ b/helpers/jenkins_lava.py
@@ -293,34 +293,8 @@ def create_jenkins_build(jenkins_build, jenkins_db_job, is_umbrella = True, umbr
             log.debug("Jenkins build {0} updated ({1})".format(jenkins_build.get_number(), ''.join([x for x in jenkins_build.name if ord(x) < 128])))
         return db_build
     except ConnectionError:
+        log.debug("Connection error on build: {0}".format(''.join([x for x in jenkins_build.name if ord(x) < 128])))
         build_status, created = JenkinsBuildStatus.objects.get_or_create(name = status_name)
         if umbrella_db_build:
             umbrella_db_build.status = build_status
             umbrella_db_build.save()
-
-
-def get_lava_hardware():
-    lava_response = [
-        {'idle': 0, 'busy': 1, 'name': 'arndale', 'offline': 2},
-        {'idle': 1, 'busy': 0, 'name': 'arndale-octa', 'offline': 0},
-        {'idle': 2, 'busy': 0, 'name': 'beaglebone-black', 'offline': 2},
-        {'idle': 0, 'busy': 0, 'name': 'beaglexm', 'offline': 0},
-        {'idle': 0, 'busy': 0, 'name': 'dynamic-vm', 'offline': 0},
-        {'idle': 0, 'busy': 0, 'name': 'highbank', 'offline': 0},
-        {'idle': 1, 'busy': 0, 'name': 'ifc6410', 'offline': 0},
-        {'idle': 5, 'busy': 0, 'name': 'kvm', 'offline': 3},
-        {'idle': 0, 'busy': 0, 'name': 'origen', 'offline': 0},
-        {'idle': 3, 'busy': 0, 'name': 'panda', 'offline': 0},
-        {'idle': 0, 'busy': 0, 'name': 'qemu', 'offline': 3},
-        {'idle': 1, 'busy': 0, 'name': 'rtsm_foundation-armv8', 'offline': 0},
-        {'idle': 2, 'busy': 0, 'name': 'rtsm_fvp_base-aemv8a', 'offline': 1},
-        {'idle': 0, 'busy': 0, 'name': 'rtsm_ve-a15x1-a7x1', 'offline': 0},
-        {'idle': 0, 'busy': 0, 'name': 'snowball_sd', 'offline': 0},
-        {'idle': 2, 'busy': 0, 'name': 'vayu', 'offline': 0},
-        {'idle': 1, 'busy': 0, 'name': 'vexpress-a9', 'offline': 0},
-        {'idle': 1, 'busy': 0, 'name': 'vexpress-tc2', 'offline': 0},
-        {'idle': 1, 'busy': 0, 'name': 'wg', 'offline': 0},
-        {'idle': 0, 'busy': 0, 'name': 'x86', 'offline': 0}
-    ]
-
-    return [hw['name'] for hw in lava_response]
diff --git a/testmanager/testrunner/migrations/0002_auto_20140704_1439.py b/testmanager/testrunner/migrations/0002_auto_20140704_1439.py
deleted file mode 100644
index da325f6..0000000
--- a/testmanager/testrunner/migrations/0002_auto_20140704_1439.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('testrunner', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Bug',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('alias', models.CharField(max_length=32)),
-                ('tracker', models.CharField(max_length=16, choices=[(b'Linaro Bugzilla', b'Linaro Bugzilla'), (b'Launchpad', b'Launchpad'), (b'Linaro Jira', b'Linaro Jira')])),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.AlterUniqueTogether(
-            name='bug',
-            unique_together=set([(b'alias', b'tracker')]),
-        ),
-    ]
diff --git a/testmanager/testrunner/migrations/0003_auto_20140707_0940.py b/testmanager/testrunner/migrations/0003_auto_20140707_0940.py
index 3f7af22..df2056f 100644
--- a/testmanager/testrunner/migrations/0003_auto_20140707_0940.py
+++ b/testmanager/testrunner/migrations/0003_auto_20140707_0940.py
@@ -7,7 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('testrunner', '0002_auto_20140704_1439'),
+        ('testplanner', '0001_initial'),
     ]
 
     operations = [
diff --git a/testmanager/testrunner/models.py b/testmanager/testrunner/models.py
index f07b80d..9b5f8fd 100644
--- a/testmanager/testrunner/models.py
+++ b/testmanager/testrunner/models.py
@@ -125,7 +125,7 @@ class JenkinsBuild(models.Model):
         if self.is_umbrella:
             for build in self.jenkinsbuild_set.all():
                 if build != self:
-                    build.tag = self.tag
+                    build.tags.add(*self.tags.all())
                     build.save()