Merge lp:~cjohnston/helipad/more-graphics-stuff into lp:helipad/graphics

[Chris Johnston]

Add manufacturer and model of gfx card for GraphicsMachines

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:25
http://s-jenkins:8080/job/helipad-graphics-ci/15/
Executed test runs:

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Does gfx_range refer to the 'le' or 'he' portion of the machine name? If so, I think this category is irrelevant and not worth tracking. It was originally used back in the day when we were testing unity 7 and needed a high end and low end box. Now just the mfg and chipset really matter. Also, newer machines aren't using this naming convention (i.e. 'ps-nvidia-310' or 'ps-intel-3000').

review: Needs Information

[Francis Ginther (fginther)]

I gave this a test drive and found that the gfx_range is the 'le', 'he' bit. I wouldn't track this as it doesn't add any factual info. Some of these 'high-end' chips are probably considered 'low-end' by today's standards.

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Francis Ginther (fginther)]

Approve!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/helipad-graphics-autolanding/5/
Executed test runs:

review: Needs Fixing (continuous-integration)

[lp:~cjohnston/helipad/more-graphics-stuff]

24. By Chris Johnston on 2013-08-26

Add better support for displaying graphics data

[Chris Johnston (cjohnston)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:24
http://s-jenkins:8080/job/helipad-graphics-ci/19/
Executed test runs:

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'management/commands/jenkins_pull_phoronix.py'
--- management/commands/jenkins_pull_phoronix.py	2013-08-25 03:54:43 +0000
+++ management/commands/jenkins_pull_phoronix.py	2013-08-26 12:42:30 +0000
@@ -1,11 +1,16 @@
+import re
 import logging
 from time import ctime
 from datetime import datetime
+
+from django.core.management.base import BaseCommand
+
+from common.management import jenkins_get
+from common.models import JenkinsJob, JenkinsBuild
+
 from graphics.models import GraphicsImage, GraphicsMachine, GraphicsMetric
-from common.models import JenkinsJob, JenkinsBuild
-from django.core.management.base import BaseCommand
+
 from graphics.util import jenkins_pull
-from common.management import jenkins_get
 
 job_names = ['openarena-benchmark',
              'gui-toolkits-benchmark',
@@ -78,36 +83,49 @@
                                     release='saucy',
                                     arch='amd64',
                                     variant='desktop',
-                                    md5=datetime.now().strftime(
-                                        "%s%f"),
+                                    md5="{}{}{}{}".format(
+                                        'saucy',
+                                        'amd64',
+                                        'desktop',
+                                        dic['iso'],
+                                    ),
                                     build_number=dic['iso'],
                                     image_type='daily',
-                                    )
+                                )
+                                machine = dic['machine']
+                                machine_regex = re.compile(
+                                    ur'(ps)-([^-]*)-([^-]*)((-[^-]*)?)$'
+                                )
+                                m = machine_regex.match(machine)
+                                if m:
+                                    self.gfx_manufacturer = m.group(2)
+                                    self.gfx_model = m.group(3)
 
                                 #get_machine, created_machine
                                 gm, cm = GraphicsMachine.objects.get_or_create(
                                     name=dic['machine'],
+                                    gfx_manufacturer=self.gfx_manufacturer,
+                                    gfx_model=self.gfx_model,
                                     mac_address='None',
-                                    )
+                                )
                                 gjj, cjj = JenkinsJob.objects.get_or_create(
                                     name=jenkins_job_name,
                                     url="/".join(url_file.split('/')[:5])
-                                    )
+                                )
                                 gjb, cjb = JenkinsBuild.objects.get_or_create(
                                     job=gjj,
                                     failed=False,
                                     build_number=dic['build'],
                                     ran_at=dt,
-                                    )
+                                )
                                 gg, cg = GraphicsMetric.objects.get_or_create(
-                                    #recorded_image
                                     image=gi,
-                                    #recorded_machine
                                     machine=gm,
-                                    #recorded_jenkins_build
                                     jenkins_build=gjb,
-                                    name="{}-{}".format(dic['machine'],
-                                                        bench_name),
+                                    name="{}-{}".format(
+                                        dic['machine'],
+                                        bench_name,
+                                    ),
                                     minimum=dic['min'],
                                     maximum=dic['max'],
                                     average=dic['average'],
@@ -116,7 +134,7 @@
                                     jenkins_url=url_file,
                                     test_resolution=dic['options'],
                                     framework='utah',
-                                    )
+                                )
 
         job_list = []
         for machine in machine_list:

=== modified file 'migrations/0001_initial.py'
--- migrations/0001_initial.py	2013-08-23 18:08:14 +0000
+++ migrations/0001_initial.py	2013-08-26 12:42:30 +0000
@@ -17,6 +17,8 @@
             ('publish', self.gf('django.db.models.fields.BooleanField')(default=True)),
             ('name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=200)),
             ('mac_address', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('gfx_manufacturer', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+            ('gfx_model', self.gf('django.db.models.fields.CharField')(max_length=4096)),
         ))
         db.send_create_signal('graphics', ['GraphicsMachine'])
 
@@ -126,6 +128,8 @@
         'graphics.graphicsmachine': {
             'Meta': {'object_name': 'GraphicsMachine', 'db_table': "'graphics_machines'"},
             'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'gfx_manufacturer': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'gfx_model': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'mac_address': ('django.db.models.fields.CharField', [], {'max_length': '200'}),

=== modified file 'models.py'
--- models.py	2013-08-23 18:08:14 +0000
+++ models.py	2013-08-26 12:42:30 +0000
@@ -5,6 +5,8 @@
 
 class GraphicsMachine(MachineBase):
     """ Graphics Machine model. """
+    gfx_manufacturer = models.CharField(max_length=4096)
+    gfx_model = models.CharField(max_length=4096)
 
     class Meta:
         db_table = "graphics_machines"