Merge lp:~cjohnston/qa-dashboard/uu into lp:qa-dashboard

[Chris Johnston]

Add Utopic Unicorn..

Add U and remove R

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:736
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/318/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/318/rebuild

review: Approve (continuous-integration)

[Joe Talbott (joetalbott)]

review: Approve

[Chris Johnston (cjohnston)]

Attempt to merge into lp:qa-dashboard failed due to conflicts:

text conflict in common/utils.py

[lp:~cjohnston/qa-dashboard/uu]

737. By Chris Johnston on 2014-04-24

Fix conflicts

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'common/utils.py'
--- common/utils.py	2014-04-23 19:33:03 +0000
+++ common/utils.py	2014-04-24 14:03:04 +0000
@@ -1,5 +1,5 @@
 # QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
+# Copyright 2012-2014 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
@@ -42,13 +42,13 @@
 
 regexes = {
     'bootspeed': re.compile(
-        ur"^bootspeed-(milestone|backfill|raring|saucy|trusty)-(desktop|touch)-([^-]*)-(.*)"
+        ur"^bootspeed-(milestone|backfill|saucy|trusty|utopic)-(desktop|touch)-([^-]*)-(.*)"
     ),
     'power': re.compile(
-        ur"^power-(milestone|backfill|raring|saucy|trusty)-(desktop)-([^-]*)-(.*)"
+        ur"^power-(milestone|backfill|saucy|trusty|utopic)-(desktop)-([^-]*)-(.*)"
     ),
     'idlepower': re.compile(
-        ur"^poweridle-(milestone|backfill|raring|saucy|trusty)-(desktop)-([^-]*)-(.*)"
+        ur"^poweridle-(milestone|backfill|saucy|trusty|utopic)-(desktop)-([^-]*)-(.*)"
     ),
     'upgrade': re.compile(
         ur".*-upgrade-.*"
@@ -57,10 +57,10 @@
         ur"^(precise|quantal)-(desktop|server|alternate)"
     ),
     'utah-smoke': re.compile(
-        ur"^(raring|saucy|trusty)-(desktop|server)-.*-smoke-.*"
+        ur"^(saucy|trusty|utopic)-(desktop|server)-.*-smoke-.*"
     ),
     'utah-smoke-data': re.compile(
-        ur"^(raring|saucy|trusty)-(desktop|server)-([^-]*)-smoke-(.*)"
+        ur"^(saucy|trusty|utopic)-(desktop|server)-([^-]*)-smoke-(.*)"
     ),
     'smoke-ec2': re.compile(
         ur"(.*)-(.*)-ec2.*"
@@ -82,7 +82,7 @@
     ),
     'kernel_sru': re.compile(
         ur"^(sru_kernel)(|_backport)-" +
-        "(lucid|precise|quantal|raring|saucy|trusty)(|_lts_hwe)-(.*)-(.*)-(.*).*"
+        "(lucid|precise|quantal|saucy|trusty|utopic)(|_lts_hwe)-(.*)-(.*)-(.*).*"
     ),
     'kernel_sru-version': re.compile(
         ur"^([^,\s]+)(\s+|,)"
@@ -144,7 +144,12 @@
                 if hasattr(obj, attr):
                     self._current[attr] = getattr(obj, attr)
 
-        json.dump(self._current, self.stream, cls=DjangoJSONEncoder, **self.options)
+        json.dump(
+            self._current,
+            self.stream,
+            cls=DjangoJSONEncoder,
+            **self.options
+        )
 
 
 def my_models(name):
@@ -196,8 +201,8 @@
     install_hooks(cfg)
     return make_app(wsgi_handler, cfg, oops_on_status=['500'])
 
+
 def update_build_numbers(images, reverse=False):
-
     if reverse:
         for image in images:
             image.rootfs_id = ""
@@ -276,6 +281,7 @@
         return wrapper
     return dec
 
+
 def lockfile_dec(lock_file, wait=False):
     def dec(func):
         def wrapper(*args, **kwargs):

=== modified file 'smokeng/dashboard.py'
--- smokeng/dashboard.py	2014-02-18 20:50:56 +0000
+++ smokeng/dashboard.py	2014-04-24 14:03:04 +0000
@@ -1,5 +1,5 @@
 # QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
+# Copyright 2012-2014 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
@@ -30,7 +30,7 @@
 )
 from smokeng.tables import SmokeKPITable
 
-KPI_RELEASES = ['precise', 'trusty']
+KPI_RELEASES = ['precise', 'trusty', 'utopic']
 KPI_VARIANT_EXCLUDES = ['touch_sf4p', 'touch_custom_demo']
 
 

=== modified file 'smokeng/management/commands/jenkins_pull_smokeng.py'
--- smokeng/management/commands/jenkins_pull_smokeng.py	2014-02-18 18:16:34 +0000
+++ smokeng/management/commands/jenkins_pull_smokeng.py	2014-04-24 14:03:04 +0000
@@ -1,5 +1,5 @@
 # QA Dashboard
-# Copyright 2012-2013 Canonical Ltd.
+# Copyright 2012-2014 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
@@ -40,7 +40,7 @@
 
 class Command(JenkinsBaseCommand):
     job_regex = re.compile(
-        ur'^(precise|quantal|raring|saucy|trusty)-' +
+        ur'^(precise|quantal|saucy|trusty|utopic)-' +
         ur'(desktop|server|alternate|touch(|_(ro|mir|custom|custom_demo|sf4p)))-' +
         ur'([^-_]+)(_|-smoke-)((?!static_validation).*)$'
     )