Helipad

Merge lp:~chris.gagnon/helipad/graphics-dont-import-blank-iso-version into lp:helipad/graphics

  1. graphics-dont-import-blank-iso-version
  2. Merge into graphics
Proposed by Chris Gagnon
Status: Merged
Approved by: Chris Johnston
Approved revision: 30
Merged at revision: 29
Proposed branch: lp:~chris.gagnon/helipad/graphics-dont-import-blank-iso-version
Merge into: lp:helipad/graphics
Diff against target: 11 lines (+1/-1)
1 file modified
management/commands/jenkins_pull_phoronix.py (+1/-1)
To merge this branch: bzr merge lp:~chris.gagnon/helipad/graphics-dont-import-blank-iso-version
Reviewer Review Type Date Requested Status
Chris Johnston Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+187315@code.launchpad.net

Commit message

don't add builds that have blank iso's due to ssh failure

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

FAILED: Continuous integration, rev:29
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/~chris.gagnon/helipad/graphics-dont-import-blank-iso-version/+merge/187315/+edit-commit-message

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

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

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

PASSED: Continuous integration, rev:29
http://s-jenkins:8080/job/helipad-graphics-ci/31/
Executed test runs:

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

review: Approve (continuous-integration)
Revision history for this message
Chris Johnston (cjohnston) wrote :

This is still importing blank build numbers

review: Needs Fixing
lp:~chris.gagnon/helipad/graphics-dont-import-blank-iso-version updated
30. By Chris Gagnon

use u'' instead of '' on if statement for importing build without an iso

Revision history for this message
Chris Gagnon (chris.gagnon) wrote :

I needed to use u'' instead of '' to find the empty dictionary value

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

PASSED: Continuous integration, rev:30
http://s-jenkins:8080/job/helipad-graphics-ci/33/
Executed test runs:

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

review: Approve (continuous-integration)
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
1=== modified file 'management/commands/jenkins_pull_phoronix.py'
2--- management/commands/jenkins_pull_phoronix.py 2013-08-26 12:40:11 +0000
3+++ management/commands/jenkins_pull_phoronix.py 2013-09-24 21:40:55 +0000
4@@ -67,7 +67,7 @@
5 if jdata != []:
6 for dic in jdata:
7 self.logger.debug('dic: {}'.format(dic))
8- if 'iso' in dic:
9+ if 'iso' in dic and dic['iso'] is not u'':
10 dt = datetime.strptime(
11 ctime(dic['time']), "%a %b %d %H:%M:%S %Y")
12

Subscribers

People subscribed via source and target branches

to all changes: