Merge lp://staging/~joetalbott/qa-dashboard/fix_sorting_again into lp://staging/qa-dashboard

Proposed by Joe Talbott
Status: Merged
Approved by: Chris Johnston
Approved revision: 645
Merged at revision: 646
Proposed branch: lp://staging/~joetalbott/qa-dashboard/fix_sorting_again
Merge into: lp://staging/qa-dashboard
Diff against target: 2210 lines (+1909/-49)
23 files modified
common/utils.py (+48/-0)
eventstat/api.py (+7/-1)
eventstat/management/commands/jenkins_pull_eventstat.py (+4/-0)
eventstat/migrations/0002_auto__add_field_eventstatimage_build_id__add_field_eventstatimage_root.py (+177/-0)
eventstat/migrations/0003_auto__chg_field_eventstatimage_build_id__chg_field_eventstatimage_buil.py (+188/-0)
idle_power/management/commands/jenkins_pull_idlepower.py (+3/-0)
idle_power/migrations/0003_auto__add_field_idlepowerimage_build_id__add_field_idlepowerimage_root.py (+166/-0)
idle_power/migrations/0004_auto__chg_field_idlepowerimage_build_id__chg_field_idlepowerimage_buil.py (+177/-0)
memevent/management/commands/jenkins_pull_memevent.py (+3/-0)
memevent/migrations/0005_auto__add_field_memoryeventimage_build_id__add_field_memoryeventimage_.py (+160/-0)
memevent/migrations/0006_auto__chg_field_memoryeventimage_build_id__chg_field_memoryeventimage_.py (+171/-0)
memevent/tables.py (+8/-1)
memory/api.py (+18/-2)
memory/management/commands/jenkins_pull_memory.py (+3/-0)
memory/migrations/0002_auto__add_field_memoryimage_build_id__add_field_memoryimage_rootfs_id_.py (+237/-0)
memory/migrations/0003_auto__chg_field_memoryimage_build_id__chg_field_memoryimage_build_numb.py (+248/-0)
performance/migrations/0001_initial.py (+20/-0)
performance/models.py (+9/-5)
power/management/commands/jenkins_pull_power.py (+3/-0)
power/migrations/0005_auto__add_field_powerimage_build_id__add_field_powerimage_rootfs_id__a.py (+118/-0)
power/migrations/0006_auto__chg_field_powerimage_build_id__chg_field_powerimage_build_number.py (+129/-0)
smokeng/management/commands/jenkins_pull_smokeng.py (+3/-20)
smokeng/migrations/0006_new_build_ids.py (+9/-20)
To merge this branch: bzr merge lp://staging/~joetalbott/qa-dashboard/fix_sorting_again
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot continuous-integration Approve
Joe Talbott Needs Resubmitting
Review via email: mp+192004@code.staging.launchpad.net

Commit message

Fix sorting/parsing new build_numbers for all remaining apps.

Description of the change

Fix sorting/parsing new build_numbers for all remaining apps.

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

The migrations have manual modifications to split the build_number so please give them a full review as well. The modifications are at the end of the forward() methods.

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

PASSED: Continuous integration, rev:644
http://10.97.0.26:8080/job/dashboard-ci/209/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/209/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

I didn't do the best job, but I see 2 things:

1) I don't think you have reverse migrations for anything other than smokeng setup to deal with these columns

2) from performance.utils import split_build_number
Not sure that's the best place. Seems odd for something like smokeng to depend on performance.utils and might lead to circular dependencies. Could this go in our common model logic instead?

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

On Mon, Oct 21, 2013 at 11:41:54PM -0000, Andy Doan wrote:
> I didn't do the best job, but I see 2 things:
>
> 1) I don't think you have reverse migrations for anything other than smokeng setup to deal with these columns

Reverse migrations don't matter, build_number is always the same and the
new columns will be removed via the reverse schema migration.

>
> 2) from performance.utils import split_build_number
> Not sure that's the best place. Seems odd for something like smokeng to depend on performance.utils and might lead to circular dependencies. Could this go in our common model logic instead?

I agree. Something was nagging me about putting it there. Will fix.

645. By Joe Talbot <email address hidden>

Move update_build_number and split_build_number into common.utils.

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

Moved {update,split}_build_number to common.utils.

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

PASSED: Continuous integration, rev:645
http://10.97.0.26:8080/job/dashboard-ci/212/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/212/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) :
review: Approve

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