Merge lp://staging/~doanac/qa-dashboard/smoke-pull-regression into lp://staging/qa-dashboard
Status: | Merged |
---|---|
Approved by: | Chris Johnston |
Approved revision: | 691 |
Merged at revision: | 691 |
Proposed branch: | lp://staging/~doanac/qa-dashboard/smoke-pull-regression |
Merge into: | lp://staging/qa-dashboard |
Diff against target: |
26 lines (+7/-2) 1 file modified
smokeng/management/commands/jenkins_pull_smokeng.py (+7/-2) |
To merge this branch: | bzr merge lp://staging/~doanac/qa-dashboard/smoke-pull-regression |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Chris Johnston | Approve | ||
Review via email:
|
Commit message
fix bug regression in our smoke pull script
the ran_at field has two paths. 1 for utah yaml results and 1 for
non-utah yaml. The utah path sends ran_at as a string while the
other path sends it as a datetime object. This makes the pull logic
smart enough to only convert when needed.
Description of the change
The dashboard is hitting an exception due to type mismatches that causing us to not be able to update bugs when build descriptions change:
fix bug regression in our smoke pull script
the ran_at field has two paths. 1 for utah yaml results and 1 for
non-utah yaml. The utah path sends ran_at as a string while the
other path sends it as a datetime object. This makes the pull logic
smart enough to only convert when needed.
review approve
merge approved
On Mon, Dec 2, 2013 at 11:47 AM, Andy Doan <email address hidden>wrote:
> Andy Doan has proposed merging integration ci-engineering) /code.launchpad .net/~doanac/ qa-dashboard/ smoke-pull- regression/ +merge/ 197416 /code.launchpad .net/~doanac/ qa-dashboard/ smoke-pull- regression/ +merge/ 197416 management/ commands/ jenkins_ pull_smokeng. py' management/ commands/ jenkins_ pull_smokeng. py 2013-11-21 management/ commands/ jenkins_ pull_smokeng. py 2013-12-02 builds. delete( ) ran_at) : datetime. strptime( ran_at, '%Y-%m-%d datetime. strptime( data['ran_ at'], '%Y-%m-%d %H:%M:%S') datetime( dashboard_ data['ran_ at']) data['passes' ] data['failures' ] data['errors' ]
> lp:~doanac/qa-dashboard/smoke-pull-regression into lp:qa-dashboard.
>
> Commit message:
> fix bug regression in our smoke pull script
>
> the ran_at field has two paths. 1 for utah yaml results and 1 for
> non-utah yaml. The utah path sends ran_at as a string while the
> other path sends it as a datetime object. This makes the pull logic
> smart enough to only convert when needed.
>
> Requested reviews:
> PS Jenkins bot (ps-jenkins): continuous-
> Canonical CI Engineering (canonical-
>
> For more details, see:
>
> https:/
>
> The dashboard is hitting an exception due to type mismatches that causing
> us to not be able to update bugs when build descriptions change:
>
> fix bug regression in our smoke pull script
>
> the ran_at field has two paths. 1 for utah yaml results and 1 for
> non-utah yaml. The utah path sends ran_at as a string while the
> other path sends it as a datetime object. This makes the pull logic
> smart enough to only convert when needed.
> --
>
> https:/
> Your team QA Dashboard Developers is subscribed to branch lp:qa-dashboard.
>
> === modified file 'smokeng/
> --- smokeng/
> 16:58:17 +0000
> +++ smokeng/
> 16:45:59 +0000
> @@ -201,6 +201,12 @@
>
> jenkins_
>
> + @staticmethod
> + def _to_datetime(
> + if type(ran_at) == str:
> + ran_at = datetime.
> %H:%M:%S')
> + return ran_at
> +
> def add_result(self, dashboard_data):
> """ Add smoke data to the database. """
>
> @@ -229,8 +235,7 @@
> )
>
> if not new_result:
> - result.ran_at = datetime.
> - dashboard_
> + result.ran_at = self._to_
> result.pass_count = dashboard_
> result.fail_count = dashboard_
> result.error_count = dashboard_
>
>
>