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 |
Related bugs: |
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.
On Tue, Jun 03, 2014 at 02:58:23PM -0000, Chris Johnston wrote: quantal) -(desktop| server| alternate) " -(desktop| server| alternate) "
>
>
> 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|
> > + ur"^(precise)
>
> 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.
> trusty| utopic) -(desktop| server) -.*-smoke- .*" quantal) -(.*)-( [^_]*)_ (.*)" -(.*)-( [^_]*)_ (.*)" {8}(\.[ 0-9]+)? $" kernel) (|_backport) -" + precise| quantal| saucy|trusty| utopic) (|_lts_ hwe)-(. *)-(.*) -(.*).* " precise| saucy|trusty| utopic) (|_lts_ hwe)-(. *)-(.*) -(.*).* " sru-version' : re.compile( ,\s]+)( \s+|,)" management/ commands/ jenkins_ pull_smokeng. py' management/ commands/ jenkins_ pull_smokeng. py 2014-04-23 17:44:00 +0000 management/ commands/ jenkins_ pull_smokeng. py 2014-05-30 14:05:44 +0000 JenkinsBaseComm and): quantal| saucy|trusty| utopic) -' + saucy|trusty| utopic) -' + server| alternate| touch(| _(ro|mir| custom| custom_ demo|sf4p) ))-' + _]+)(_| -smoke- )((?!static_ validation) .*)$' /code.launchpad .net/~cjohnston /qa-dashboard/ remove- quantal/ +merge/ 221547
> > ),
> > 'utah-smoke': re.compile(
> > ur"^(saucy|
> > @@ -72,7 +72,7 @@
> > ur"^(.*)-(.*).*"
> > ),
> > 'smoke-data': re.compile(
> > - ur"^(precise|
> > + ur"^(precise)
> > ),
> > 'smoke-buildid': re.compile(
> > r"^[0-9]
> > @@ -82,7 +82,7 @@
> > ),
> > 'kernel_sru': re.compile(
> > ur"^(sru_
> > - "(lucid|
> > + "(lucid|
> > ),
> > 'kernel_
> > ur"^([^
> >
> > === modified file 'smokeng/
> > --- smokeng/
> > +++ smokeng/
> > @@ -40,7 +40,7 @@
> >
> > class Command(
> > job_regex = re.compile(
> > - ur'^(precise|
> > + ur'^(precise|
> > ur'(desktop|
> > ur'([^-
> > )
> >
>
>
> --
> https:/
> Your team QA Dashboard Developers is subscribed to branch lp:qa-dashboard.