Ubuntu CI Dashboard

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

  1. wily-dashboard
  2. Merge into dev
Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 768
Merged at revision: 767
Proposed branch: lp:~pwlars/qa-dashboard/wily-dashboard
Merge into: lp:qa-dashboard
Diff against target: 71 lines (+12/-8)
3 files modified
common/templates/layout.html (+1/-1)
common/utils.py (+10/-6)
smokeng/management/commands/jenkins_pull_smokeng.py (+1/-1)
To merge this branch: bzr merge lp:~pwlars/qa-dashboard/wily-dashboard
Reviewer Review Type Date Requested Status
Joe Talbott Approve
Paul Larson (community) Needs Resubmitting
PS Jenkins bot continuous-integration Pending
Review via email: [email protected]

Commit message

Support wily werewolf in the dashboard

Description of the change

Support wily werewolf in the dashboard

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

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 updated
768. By Paul Larson

Also fix template for Wily

Revision history for this message
Paul Larson (pwlars) wrote :

Added as discussed on irc

review: Needs Resubmitting
Revision history for this message
Joe Talbott (joetalbott) wrote :

Thanks for this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/templates/layout.html'
2--- common/templates/layout.html 2014-04-03 14:14:15 +0000
3+++ common/templates/layout.html 2015-05-04 17:11:31 +0000
4@@ -44,7 +44,7 @@
5 </div>
6 <ul>
7 {% plugin_links url %}
8- <li><a href="https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/">Proposed</a></li>
9+ <li><a href="https://jenkins.qa.ubuntu.com/view/Wily/view/AutoPkgTest/">Proposed</a></li>
10 <li><a href="https://jenkins.qa.ubuntu.com/view/Upgrade/">Upgrade</a></li>
11 </ul>
12 </nav>
13
14=== modified file 'common/utils.py'
15--- common/utils.py 2014-10-28 20:26:01 +0000
16+++ common/utils.py 2015-05-04 17:11:31 +0000
17@@ -42,13 +42,16 @@
18
19 regexes = {
20 'bootspeed': re.compile(
21- ur"^bootspeed-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
22+ ur"^bootspeed-(milestone|backfill|"
23+ "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
24 ),
25 'power': re.compile(
26- ur"^power-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
27+ ur"^power-(milestone|backfill|"
28+ "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
29 ),
30 'idlepower': re.compile(
31- ur"^poweridle-(milestone|backfill|trusty|utopic|vivid)-([^-]+)-([^-]*)-(.*)"
32+ ur"^poweridle-(milestone|backfill|"
33+ "trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-(.*)"
34 ),
35 'upgrade': re.compile(
36 ur".*-upgrade-.*"
37@@ -57,10 +60,10 @@
38 ur"^(precise)-([^-]+)"
39 ),
40 'utah-smoke': re.compile(
41- ur"^(trusty|utopic|vivid)-([^-]+)-.*-smoke-.*"
42+ ur"^(trusty|utopic|vivid|wily)-([^-]+)-.*-smoke-.*"
43 ),
44 'utah-smoke-data': re.compile(
45- ur"^(trusty|utopic|vivid)-([^-]+)-([^-]*)-smoke-(.*)"
46+ ur"^(trusty|utopic|vivid|wily)-([^-]+)-([^-]*)-smoke-(.*)"
47 ),
48 'smoke-ec2': re.compile(
49 ur"(.*)-(.*)-ec2.*"
50@@ -82,7 +85,8 @@
51 ),
52 'kernel_sru': re.compile(
53 ur"^(sru_kernel)(|_backport)-" +
54- "(lucid|precise|trusty|utopic|vivid)(|_lts_hwe)-(.*)-(.*)-(.*).*"
55+ "(lucid|precise|trusty|utopic|vivid|wily)"
56+ "(|_lts_hwe)-(.*)-(.*)-(.*).*"
57 ),
58 'kernel_sru-version': re.compile(
59 ur"^([^,\s]+)(\s+|,)"
60
61=== modified file 'smokeng/management/commands/jenkins_pull_smokeng.py'
62--- smokeng/management/commands/jenkins_pull_smokeng.py 2014-10-28 15:26:43 +0000
63+++ smokeng/management/commands/jenkins_pull_smokeng.py 2015-05-04 17:11:31 +0000
64@@ -40,7 +40,7 @@
65
66 class Command(JenkinsBaseCommand):
67 job_regex = re.compile(
68- ur'^(precise|trusty|utopic|vivid)-' +
69+ ur'^(precise|trusty|utopic|vivid|wily)-' +
70 ur'([^-]+)-([^-_]+)(_|-smoke-)((?!static_validation).*)$'
71 )
72

Subscribers

People subscribed via source and target branches