Merge lp:~pwlars/qa-dashboard/wily-dashboard into lp:qa-dashboard

[Paul Larson]

Support wily werewolf in the dashboard

Support wily werewolf in the dashboard

[Joe Talbott (joetalbott)]

This looks good. There's one more change that needs to happen to one of the templates I believe. I think there are two commits linked in the wiki.

[lp:~pwlars/qa-dashboard/wily-dashboard]

768. By Paul Larson on 2015-05-04

Also fix template for Wily

[Paul Larson (pwlars)]

Added as discussed on irc

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

Thanks for this.

review: Approve

=== modified file 'common/templates/layout.html'
--- common/templates/layout.html	2014-04-03 14:14:15 +0000
+++ common/templates/layout.html	2015-05-04 17:11:31 +0000
@@ -44,7 +44,7 @@
                             </div>
            <ul>
                             {% plugin_links url %}
-              <li><a href="https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/">Proposed</a></li>
+              <li><a href="https://jenkins.qa.ubuntu.com/view/Wily/view/AutoPkgTest/">Proposed</a></li>
               <li><a href="https://jenkins.qa.ubuntu.com/view/Upgrade/">Upgrade</a></li>
         </ul>
         </nav>

=== modified file 'common/utils.py'
--- common/utils.py	2014-10-28 20:26:01 +0000
+++ common/utils.py	2015-05-04 17:11:31 +0000
@@ -42,13 +42,16 @@
 
 regexes = {
     'bootspeed': re.compile(
-        ur"^bootspeed-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
+        ur"^bootspeed-(milestone|backfill|"
+        "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
     ),
     'power': re.compile(
-        ur"^power-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
+        ur"^power-(milestone|backfill|"
+        "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
     ),
     'idlepower': re.compile(
-        ur"^poweridle-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
+        ur"^poweridle-(milestone|backfill|"
+        "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
     ),
     'upgrade': re.compile(
         ur".*-upgrade-.*"
@@ -57,10 +60,10 @@
         ur"^(precise)-([^-]+)"
     ),
     'utah-smoke': re.compile(
-        ur"^(trusty|utopic|vivid)-([^-]+)-.*-smoke-.*"
+        ur"^(trusty|utopic|vivid|wily)-([^-]+)-.*-smoke-.*"
     ),
     'utah-smoke-data': re.compile(
-        ur"^(trusty|utopic|vivid)-([^-]+)-([^-]*)-smoke-(.*)"
+        ur"^(trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-smoke-(.*)"
     ),
     'smoke-ec2': re.compile(
         ur"(.*)-(.*)-ec2.*"
@@ -82,7 +85,8 @@
     ),
     'kernel_sru': re.compile(
         ur"^(sru_kernel)(|_backport)-" +
-        "(lucid|precise|trusty|utopic|vivid)(|_lts_hwe)-(.*)-(.*)-(.*).*"
+        "(lucid|precise|trusty|utopic|vivid|wily)"
+        "(|_lts_hwe)-(.*)-(.*)-(.*).*"
     ),
     'kernel_sru-version': re.compile(
         ur"^([^,\s]+)(\s+|,)"

=== modified file 'smokeng/management/commands/jenkins_pull_smokeng.py'
--- smokeng/management/commands/jenkins_pull_smokeng.py	2014-10-28 15:26:43 +0000
+++ smokeng/management/commands/jenkins_pull_smokeng.py	2015-05-04 17:11:31 +0000
@@ -40,7 +40,7 @@
 
 class Command(JenkinsBaseCommand):
     job_regex = re.compile(
-        ur'^(precise|trusty|utopic|vivid)-' +
+        ur'^(precise|trusty|utopic|vivid|wily)-' +
         ur'([^-]+)-([^-_]+)(_|-smoke-)((?!static_validation).*)$'
     )