Drizzle Automation

Merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-configure-and-make-options into lp://qastaging/drizzle-automation

  1. add-configure-and-make-options
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-configure-and-make-options
Merge into: lp://qastaging/drizzle-automation
Diff against target: 108 lines
5 files modified
drizzle/automation/crashme/run.py (+10/-1)
drizzle/automation/drizzleslap/run.py (+10/-1)
drizzle/automation/lib/sandbox.py (+3/-2)
drizzle/automation/randgen/run.py (+11/-1)
drizzle/automation/sqlbench/run.py (+11/-1)
To merge this branch: bzr merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-configure-and-make-options
Reviewer Review Type Date Requested Status
Jay Pipes Approve
Review via email: mp+13724@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Check for configure and make options in drizzleslap, sqlbench, randgen and crashme. Also add more debugging output so we can see what is going wrong when sysbench randomly fails during a bzr pull command

Revision history for this message
Jay Pipes (jaypipes) wrote :

Good stuff! :) Merging in now...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzle/automation/crashme/run.py'
2--- drizzle/automation/crashme/run.py 2009-10-18 13:20:04 +0000
3+++ drizzle/automation/crashme/run.py 2009-10-21 18:30:25 +0000
4@@ -108,7 +108,16 @@
5 client= client_adapter(variables['working_dir'], server.getPort())
6
7 if variables['no_build'] is False:
8- builder= builder_adapter(variables['working_dir'])
9+ try:
10+ configure_options= variables['defaults']['configure_options']
11+ except KeyError:
12+ configure_options= ""
13+ try:
14+ make_options= variables['defaults']['make_options']
15+ except KeyError:
16+ make_options= ""
17+
18+ builder= builder_adapter(variables['working_dir'], configure_options, make_options)
19 builder.build(variables['force_build'])
20
21 server.stopAll()
22
23=== modified file 'drizzle/automation/drizzleslap/run.py'
24--- drizzle/automation/drizzleslap/run.py 2009-10-19 22:40:40 +0000
25+++ drizzle/automation/drizzleslap/run.py 2009-10-21 18:30:25 +0000
26@@ -144,7 +144,16 @@
27 client= client_adapter(variables['working_dir'], server.getPort())
28
29 if variables['no_build'] is False:
30- builder= builder_adapter(variables['working_dir'])
31+ try:
32+ configure_options= variables['defaults']['configure_options']
33+ except KeyError:
34+ configure_options= ""
35+ try:
36+ make_options= variables['defaults']['make_options']
37+ except KeyError:
38+ make_options= ""
39+
40+ builder= builder_adapter(variables['working_dir'], configure_options, make_options)
41 builder.build(variables['force_build'])
42
43 server.stopAll()
44
45=== modified file 'drizzle/automation/lib/sandbox.py'
46--- drizzle/automation/lib/sandbox.py 2009-10-16 21:33:47 +0000
47+++ drizzle/automation/lib/sandbox.py 2009-10-21 18:30:25 +0000
48@@ -80,11 +80,12 @@
49 os.chdir(test_root_branch_dir)
50
51 if no_pull_flag is False:
52- logging.info("Pulling latest revision into sandbox root \"%s\"" % test_root_branch_dir)
53+ logging.info("Pulling latest revision into sandbox root \"%s\" with \"bzr pull --overwrite\"" % test_root_branch_dir)
54
55 (retcode, output)= commands.getstatusoutput("bzr pull --overwrite")
56 if retcode != 0:
57- logging.error("Branch directory \"%s\" in repo-dir \"%s\" exists, but is not a BZR branch! Error code - %d" % (test_root_branch_dir, self.repo_dir,retcode))
58+ (retcode2, revno)= commands.getstatusoutput("bzr revno")
59+ logging.error("Branch directory \"%s\" in repo-dir \"%s\" exists, but is not a BZR branch! bzr revision = %s, Error code = %d" % (test_root_branch_dir, self.repo_dir,revno,retcode))
60 sys.exit(1)
61 (retcode, output)= commands.getstatusoutput("bzr revno")
62 self.revno= output
63
64=== modified file 'drizzle/automation/randgen/run.py'
65--- drizzle/automation/randgen/run.py 2009-10-14 22:35:50 +0000
66+++ drizzle/automation/randgen/run.py 2009-10-21 18:30:25 +0000
67@@ -98,7 +98,17 @@
68 client= client_adapter(variables['working_dir'], server.getPort())
69
70 if variables['no_build'] is False:
71- builder= builder_adapter(variables['working_dir'])
72+ try:
73+ configure_options= variables['defaults']['configure_options']
74+ except KeyError:
75+ configure_options= ""
76+
77+ try:
78+ make_options= variables['defaults']['make_options']
79+ except KeyError:
80+ make_options= ""
81+
82+ builder= builder_adapter(variables['working_dir'], configure_options, make_options)
83 builder.build(variables['force_build'])
84
85 # stop any servers that are running
86
87=== modified file 'drizzle/automation/sqlbench/run.py'
88--- drizzle/automation/sqlbench/run.py 2009-10-14 22:35:50 +0000
89+++ drizzle/automation/sqlbench/run.py 2009-10-21 18:30:25 +0000
90@@ -139,7 +139,17 @@
91 client= client_adapter(variables['working_dir'], server.getPort())
92
93 if variables['no_build'] is False:
94- builder= builder_adapter(variables['working_dir'])
95+ try:
96+ configure_options= variables['defaults']['configure_options']
97+ except KeyError:
98+ configure_options= ""
99+
100+ try:
101+ make_options= variables['defaults']['make_options']
102+ except KeyError:
103+ make_options= ""
104+
105+ builder= builder_adapter(variables['working_dir'], configure_options, make_options)
106 builder.build(variables['force_build'])
107
108 server.stopAll()

Subscribers

People subscribed via source and target branches

to all changes: