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

Proposed by Joe Talbott
Status: Merged
Approved by: Chris Johnston
Approved revision: 680
Merged at revision: 678
Proposed branch: lp://staging/~joetalbott/qa-dashboard/fix_jenkins_job
Merge into: lp://staging/qa-dashboard
Diff against target: 53 lines (+8/-25)
2 files modified
common/management/__init__.py (+7/-1)
scripts/branch-update.sh (+1/-24)
To merge this branch: bzr merge lp://staging/~joetalbott/qa-dashboard/fix_jenkins_job
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Joe Talbott Needs Resubmitting
Andy Doan (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+194601@code.staging.launchpad.net

Commit message

Fix jenkins job object matching.

We were getting duplicate key errors from the DB due to matching on name and url, but only name is the primary key.

Start using the python version of branch-update.

Description of the change

Fix jenkins job object matching.

We were getting duplicate key errors from the DB due to matching on name and url, but only name is the primary key.

Start using the python version of branch-update.

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

FAILED: Continuous integration, rev:679
http://10.97.0.26:8080/job/dashboard-ci/254/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

 common/management/__init__.py|255 col 10| E901 SyntaxError: invalid syntax
  2 common/management/__init__.py|639 col 1| E901 TokenError: EOF in multi-line statement

review: Needs Fixing
680. By Joe Talbot <email address hidden>

common - Fix typo.

Revision history for this message
Joe Talbott (joetalbott) :
review: Needs Resubmitting
Revision history for this message
Chris Johnston (cjohnston) :
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