Drizzle Automation

Merge lp:~kalebral-deactivatedaccount/drizzle-automation/fix-getNextRunID into lp:drizzle-automation

  1. fix-getNextRunID
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Approved by: Patrick Crews
Approved revision: 225
Merged at revision: 225
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle-automation/fix-getNextRunID
Merge into: lp:drizzle-automation
Diff against target: 82 lines (+8/-8)
6 files modified
drizzle/automation/dbt2/run.py (+1/-1)
drizzle/automation/drizzleslap/run.py (+1/-1)
drizzle/automation/lib/util.py (+3/-3)
drizzle/automation/reports/run.py (+1/-1)
drizzle/automation/sqlbench/run.py (+1/-1)
drizzle/automation/sysbench/run.py (+1/-1)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle-automation/fix-getNextRunID
Reviewer Review Type Date Requested Status
Patrick Crews Approve
Review via email: mp+46556@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Patrick Crews (patrick-crews) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzle/automation/dbt2/run.py'
2--- drizzle/automation/dbt2/run.py 2010-06-24 18:15:10 +0000
3+++ drizzle/automation/dbt2/run.py 2011-01-18 00:12:27 +0000
4@@ -219,7 +219,7 @@
5 logging.info("Sending email...")
6 # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
7 #from_string= ('%s <drizzle-benchmark@lists.launchpad.net>' % socket.gethostname())
8- from_string= ('%s <eday@oddments.org>' % socket.gethostname())
9+ from_string= ('%s <hudson@inaugust.com>' % socket.gethostname())
10 util.mail(from_string, variables['dbt2']['report_email'], "DBT2 Report - %s" % server_version, email_text)
11
12 return True
13
14=== modified file 'drizzle/automation/drizzleslap/run.py'
15--- drizzle/automation/drizzleslap/run.py 2010-08-19 21:23:40 +0000
16+++ drizzle/automation/drizzleslap/run.py 2011-01-18 00:12:27 +0000
17@@ -250,7 +250,7 @@
18 logging.info("Sending email...")
19 # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
20 #from_string= ('%s <drizzle-benchmark@lists.launchpad.net>' % socket.gethostname())
21- from_string= ('%s <eday@oddments.org>' % socket.gethostname())
22+ from_string= ('%s <hudson@inaugust.com>' % socket.gethostname())
23 util.mail(from_string, variables['drizzleslap']['report_email'], "Drizzleslap Report - %s" % server_version, email_text)
24
25 return True
26
27=== modified file 'drizzle/automation/lib/util.py'
28--- drizzle/automation/lib/util.py 2010-11-11 22:19:38 +0000
29+++ drizzle/automation/lib/util.py 2011-01-18 00:12:27 +0000
30@@ -124,10 +124,10 @@
31
32 from drizzle.automation.lib import db
33 result= db.get_select(sql)
34- if result[0][0] == "NULL":
35+ if result[0][0] >= 1:
36+ new_run_id= int(result[0][0]) + 1
37+ else:
38 new_run_id= 1
39- else:
40- new_run_id= int(result[0][0]) + 1
41
42 return new_run_id
43
44
45=== modified file 'drizzle/automation/reports/run.py'
46--- drizzle/automation/reports/run.py 2010-01-07 20:48:08 +0000
47+++ drizzle/automation/reports/run.py 2011-01-18 00:12:27 +0000
48@@ -43,7 +43,7 @@
49 if email_flag is True:
50 # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
51 #from_string= ('%s <drizzle-benchmark@lists.launchpad.net>' % socket.gethostname())
52- from_string= ('%s <eday@oddments.org>' % socket.gethostname())
53+ from_string= ('%s <hudson@inaugust.com>' % socket.gethostname())
54 util.mail(from_string, email_string, "%s Report for Build %d and Run ID %d" % (report_string, int(bzr_revision), int(run_id)), report_text)
55 else:
56 print report_text
57
58=== modified file 'drizzle/automation/sqlbench/run.py'
59--- drizzle/automation/sqlbench/run.py 2010-03-26 03:55:43 +0000
60+++ drizzle/automation/sqlbench/run.py 2011-01-18 00:12:27 +0000
61@@ -235,7 +235,7 @@
62 logging.info("Sending email...")
63 # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
64 #from_string= ('%s <drizzle-benchmark@lists.launchpad.net>' % socket.gethostname())
65- from_string= ('%s <eday@oddments.org>' % socket.gethostname())
66+ from_string= ('%s <hudson@inaugust.com>' % socket.gethostname())
67 util.mail(from_string, variables['sysbench']['report_email'], "SQLBENCH Regression Report - %s" % server_version, email_text)
68
69 return True
70
71=== modified file 'drizzle/automation/sysbench/run.py'
72--- drizzle/automation/sysbench/run.py 2010-11-02 14:14:04 +0000
73+++ drizzle/automation/sysbench/run.py 2011-01-18 00:12:27 +0000
74@@ -367,7 +367,7 @@
75 email_text= reports.getSysbenchRegressionReport(working_dir, bench_config_name, run_id, run_date, server_name, variables['bzr_branch'], int(variables['bzr_revision']))
76 # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
77 #from_string= ('%s <drizzle-benchmark@lists.launchpad.net>' % socket.gethostname())
78- from_string= ('%s <eday@oddments.org>' % socket.gethostname())
79+ from_string= ('%s <hudson@inaugust.com>' % socket.gethostname())
80 util.mail(from_string, variables['sysbench']['report_email'], "SYSBENCH Regression Report - %s" % server_version, email_text)
81
82 return True

Subscribers

People subscribed via source and target branches

to all changes: