Helipad

Merge lp://qastaging/~cjohnston/helipad/ci-d3 into lp://qastaging/helipad/ci

  1. ci-d3
  2. Merge into ci
Proposed by Chris Johnston
Status: Rejected
Rejected by: Chris Johnston
Proposed branch: lp://qastaging/~cjohnston/helipad/ci-d3
Merge into: lp://qastaging/helipad/ci
Diff against target: 193 lines (+146/-7) (has conflicts)
3 files modified
api.py (+73/-0)
templates/ci/project_detail.html (+47/-7)
urls_api.py (+26/-0)
Text conflict in templates/ci/project_detail.html
To merge this branch: bzr merge lp://qastaging/~cjohnston/helipad/ci-d3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
helipad-team Pending
Review via email: mp+176420@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2013-07-23.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:15
http://s-jenkins:8080/job/helipad-ci-ci/26/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/26/rebuild

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) wrote : Posted in a previous version of this proposal

L20 doesn't appear to be needed.
L57 and L61 I don't like using exceptions to handle this sort of logic. I like:

average = 0

if len(data) != 0
    average = sum(data) / len(data

L99 this try block seems fragile to me. I think I'd do a .filter(project.stack__isnull=False, ...) if .count() == 0: stack = 0

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:17
http://s-jenkins:8080/job/helipad-ci-ci/27/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/27/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:19
http://s-jenkins:8080/job/helipad-ci-ci/28/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/28/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:19
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cjohnston/helipad/ci-d3/+merge/176420/+edit-commit-message

http://s-jenkins:8080/job/helipad-ci-ci/31/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-ci-ci/31/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

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

to all changes: