Merge lp://staging/~cjohnston/qa-dashboard/remove-quantal into lp://staging/qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 744
Merged at revision: 744
Proposed branch: lp://staging/~cjohnston/qa-dashboard/remove-quantal
Merge into: lp://staging/qa-dashboard
Diff against target: 43 lines (+4/-4)
2 files modified
common/utils.py (+3/-3)
smokeng/management/commands/jenkins_pull_smokeng.py (+1/-1)
To merge this branch: bzr merge lp://staging/~cjohnston/qa-dashboard/remove-quantal
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Andy Doan (community) Approve
Review via email: mp+221547@code.staging.launchpad.net

Commit message

Remove quantal from pull scripts

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) :
Revision history for this message
Joe Talbott (joetalbott) wrote :

On Tue, Jun 03, 2014 at 02:58:23PM -0000, Chris Johnston wrote:
>
>
> Diff comments:
>
> > === modified file 'common/utils.py'
> > --- common/utils.py 2014-04-24 14:02:48 +0000
> > +++ common/utils.py 2014-05-30 14:05:44 +0000
> > @@ -54,7 +54,7 @@
> > ur".*-upgrade-.*"
> > ),
> > 'smoke': re.compile(
> > - ur"^(precise|quantal)-(desktop|server|alternate)"
> > + ur"^(precise)-(desktop|server|alternate)"
>
> I believe that this has something to do with 'the way things used to be done' I'm not sure if it can be removed or not.. Should ask Joe..

I'm pretty sure this can be removed now.

>
> > ),
> > 'utah-smoke': re.compile(
> > ur"^(saucy|trusty|utopic)-(desktop|server)-.*-smoke-.*"
> > @@ -72,7 +72,7 @@
> > ur"^(.*)-(.*).*"
> > ),
> > 'smoke-data': re.compile(
> > - ur"^(precise|quantal)-(.*)-([^_]*)_(.*)"
> > + ur"^(precise)-(.*)-([^_]*)_(.*)"
> > ),
> > 'smoke-buildid': re.compile(
> > r"^[0-9]{8}(\.[0-9]+)?$"
> > @@ -82,7 +82,7 @@
> > ),
> > 'kernel_sru': re.compile(
> > ur"^(sru_kernel)(|_backport)-" +
> > - "(lucid|precise|quantal|saucy|trusty|utopic)(|_lts_hwe)-(.*)-(.*)-(.*).*"
> > + "(lucid|precise|saucy|trusty|utopic)(|_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-04-23 17:44:00 +0000
> > +++ smokeng/management/commands/jenkins_pull_smokeng.py 2014-05-30 14:05:44 +0000
> > @@ -40,7 +40,7 @@
> >
> > class Command(JenkinsBaseCommand):
> > job_regex = re.compile(
> > - ur'^(precise|quantal|saucy|trusty|utopic)-' +
> > + ur'^(precise|saucy|trusty|utopic)-' +
> > ur'(desktop|server|alternate|touch(|_(ro|mir|custom|custom_demo|sf4p)))-' +
> > ur'([^-_]+)(_|-smoke-)((?!static_validation).*)$'
> > )
> >
>
>
> --
> https://code.launchpad.net/~cjohnston/qa-dashboard/remove-quantal/+merge/221547
> Your team QA Dashboard Developers is subscribed to branch lp:qa-dashboard.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:744
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/328/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches