juju-ci-tools

Merge lp:~sinzui/juju-ci-tools/bootstrap-to into lp:juju-ci-tools

  1. bootstrap-to
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 1915
Proposed branch: lp:~sinzui/juju-ci-tools/bootstrap-to
Merge into: lp:juju-ci-tools
Diff against target: 259 lines (+23/-12)
16 files modified
assess_bootstrap.py (+0/-2)
tests/test_assess_autoload_credentials.py (+1/-1)
tests/test_assess_cloud.py (+3/-2)
tests/test_assess_log_forward.py (+1/-0)
tests/test_assess_log_rotation.py (+2/-2)
tests/test_assess_mixed_images.py (+1/-0)
tests/test_assess_model_config_tree.py (+1/-0)
tests/test_assess_model_migration.py (+1/-0)
tests/test_assess_proxy.py (+1/-1)
tests/test_assess_resources.py (+1/-1)
tests/test_deploy_stack.py (+1/-0)
tests/test_generate_perfscale_results.py (+2/-1)
tests/test_perfscale_longrunning.py (+1/-0)
tests/test_scale_out.py (+3/-0)
tests/test_utility.py (+2/-2)
utility.py (+2/-0)
To merge this branch: bzr merge lp:~sinzui/juju-ci-tools/bootstrap-to
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+318307@code.launchpad.net

Description of the change

Move --to from assess_bootstrap to add_basic_testing_arguments.

The vsphere tests are running with a hacked version of juju-ci-tools to pass the zone
    --to 'zone=jujuqacluster'

Juju has supported --to for years, and the ModelClient and descendants support it, but only assess_bootstrap uses it. We need to pass --to in all these that we need to run against vsphere.

This branch just moves the --to arg add_basic_testing_arguments, then update all the tests to expect --to. There are two whitespace lint fixes too.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

Conditionally approved. Please do not land without also updating the code so that --to works for every script that accepts it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'assess_bootstrap.py'
2--- assess_bootstrap.py 2017-02-10 06:51:00 +0000
3+++ assess_bootstrap.py 2017-02-25 14:56:12 +0000
4@@ -122,8 +122,6 @@
5 parser.add_argument('--local-metadata-source',
6 action='store', default=None,
7 help='Directory with pre-loaded metadata.')
8- parser.add_argument('--to', action='store', default=None,
9- help='bootstrap to (when part=to only)')
10 return parser.parse_args(argv)
11
12
13
14=== modified file 'tests/test_assess_autoload_credentials.py'
15--- tests/test_assess_autoload_credentials.py 2017-01-17 18:04:08 +0000
16+++ tests/test_assess_autoload_credentials.py 2017-02-25 14:56:12 +0000
17@@ -51,7 +51,7 @@
18 Namespace(agent_stream=None, agent_url=None, bootstrap_host=None,
19 debug=False, deadline=None, env='env',
20 juju_bin='/bin/juju', keep_env=False, logs=log,
21- machine=[], region=None, series=None,
22+ machine=[], region=None, series=None, to=None,
23 temp_env_name='functional-autoload-credentials',
24 upload_tools=False, verbose=logging.INFO,
25 ))
26
27=== modified file 'tests/test_assess_cloud.py'
28--- tests/test_assess_cloud.py 2017-02-13 15:10:34 +0000
29+++ tests/test_assess_cloud.py 2017-02-25 14:56:12 +0000
30@@ -228,7 +228,7 @@
31 cloud='bar', clouds_file='foo', deadline=None, debug=False,
32 juju_bin='baz', keep_env=False, logs=log_dir, machine=[],
33 region=None, series=None, temp_env_name='qux', upload_tools=False,
34- verbose=logging.INFO, test='combined', config=None,
35+ verbose=logging.INFO, test='combined', config=None, to=None,
36 ))
37
38 def test_parse_args_combined_config(self):
39@@ -247,6 +247,7 @@
40 juju_bin='baz', keep_env=False, logs=log_dir, machine=[],
41 region=None, series=None, temp_env_name='qux', upload_tools=False,
42 verbose=logging.INFO, test='kill-controller', config=None,
43+ to=None,
44 ))
45
46 def test_parse_args_kill_controller_config(self):
47@@ -265,7 +266,7 @@
48 juju_bin='baz', keep_env=False, logs=log_dir, machine=[],
49 region=None, series=None, temp_env_name='qux', upload_tools=False,
50 verbose=logging.INFO, test='provisioning', config=None,
51- machine_series=None,
52+ machine_series=None, to=None,
53 ))
54
55 def test_parse_args_provisioning_config(self):
56
57=== modified file 'tests/test_assess_log_forward.py'
58--- tests/test_assess_log_forward.py 2016-09-20 14:19:15 +0000
59+++ tests/test_assess_log_forward.py 2017-02-25 14:56:12 +0000
60@@ -32,6 +32,7 @@
61 machine=[],
62 region=None,
63 series=None,
64+ to=None,
65 upload_tools=False,
66 verbose=20,
67 deadline=None,
68
69=== modified file 'tests/test_assess_log_rotation.py'
70--- tests/test_assess_log_rotation.py 2017-01-20 21:30:58 +0000
71+++ tests/test_assess_log_rotation.py 2017-02-25 14:56:12 +0000
72@@ -160,7 +160,7 @@
73
74 def test_happy_log(self):
75 client = Mock()
76- client.get_juju_output.return_value = '\n'*100
77+ client.get_juju_output.return_value = '\n' * 100
78 # Ensure that no exception is raised
79 assess_debug_log(client, timeout=120)
80 client.get_juju_output.assert_called_once_with(
81@@ -206,7 +206,7 @@
82 self.assertEqual(args, Namespace(
83 agent='machine', env='b', juju_bin='c/juju', logs='d',
84 temp_env_name='e', debug=False, agent_stream=None, agent_url=None,
85- bootstrap_host=None, machine=[], keep_env=False,
86+ bootstrap_host=None, machine=[], keep_env=False, to=None,
87 region=None, series=None, upload_tools=False, verbose=20))
88
89 def test_parse_args_unit(self):
90
91=== modified file 'tests/test_assess_mixed_images.py'
92--- tests/test_assess_mixed_images.py 2017-01-17 18:04:08 +0000
93+++ tests/test_assess_mixed_images.py 2017-02-25 14:56:12 +0000
94@@ -40,6 +40,7 @@
95 keep_env=False,
96 machine=[],
97 region=None,
98+ to=None,
99 deadline=None,
100 ), args)
101
102
103=== modified file 'tests/test_assess_model_config_tree.py'
104--- tests/test_assess_model_config_tree.py 2017-01-17 18:04:08 +0000
105+++ tests/test_assess_model_config_tree.py 2017-02-25 14:56:12 +0000
106@@ -37,6 +37,7 @@
107 machine=[],
108 region=None,
109 series=None,
110+ to=None,
111 upload_tools=False,
112 verbose=20,
113 deadline=None,
114
115=== modified file 'tests/test_assess_model_migration.py'
116--- tests/test_assess_model_migration.py 2017-02-21 19:44:55 +0000
117+++ tests/test_assess_model_migration.py 2017-02-25 14:56:12 +0000
118@@ -72,6 +72,7 @@
119 machine=[],
120 region=None,
121 series=None,
122+ to=None,
123 upload_tools=False,
124 verbose=20,
125 deadline=None,
126
127=== modified file 'tests/test_assess_proxy.py'
128--- tests/test_assess_proxy.py 2017-01-17 18:04:08 +0000
129+++ tests/test_assess_proxy.py 2017-02-25 14:56:12 +0000
130@@ -30,7 +30,7 @@
131 agent_stream=None, agent_url=None, bootstrap_host=None,
132 client_interface='eth0', controller_interface='lxdbr0',
133 deadline=None, debug=False, env='an-env', juju_bin='/bin/juju',
134- keep_env=False, logs=log_dir, machine=[], region=None,
135+ keep_env=False, logs=log_dir, machine=[], region=None, to=None,
136 scenario='both-proxied', series=None, temp_env_name='an-env-mod',
137 upload_tools=False, verbose=20)
138 self.assertEqual(expected_args, args)
139
140=== modified file 'tests/test_assess_resources.py'
141--- tests/test_assess_resources.py 2016-10-06 01:28:20 +0000
142+++ tests/test_assess_resources.py 2017-02-25 14:56:12 +0000
143@@ -220,7 +220,7 @@
144 agent_stream=None, agent_timeout=1800, agent_url=None,
145 bootstrap_host=None, debug=False, env='an-env', juju_bin='/bin/juju',
146 keep_env=False, large_test_enabled=False, logs='/tmp/logs', machine=[],
147- region=None, resource_timeout=1800, series=None,
148+ region=None, resource_timeout=1800, series=None, to=None,
149 temp_env_name='an-env-mod', upload_tools=False, verbose=10,
150 deadline=None,)
151
152
153=== modified file 'tests/test_deploy_stack.py'
154--- tests/test_deploy_stack.py 2017-02-22 16:40:34 +0000
155+++ tests/test_deploy_stack.py 2017-02-25 14:56:12 +0000
156@@ -2621,6 +2621,7 @@
157 with_chaos=0,
158 jes=False,
159 region=None,
160+ to=None,
161 deadline=None,
162 controller_host=None,
163 use_charmstore=False,
164
165=== modified file 'tests/test_generate_perfscale_results.py'
166--- tests/test_generate_perfscale_results.py 2017-02-01 05:12:43 +0000
167+++ tests/test_generate_perfscale_results.py 2017-02-25 14:56:12 +0000
168@@ -36,6 +36,7 @@
169 machine=[],
170 region=None,
171 series=None,
172+ to=None,
173 upload_tools=False,
174 verbose=20,
175 deadline=None)
176@@ -353,7 +354,7 @@
177 """Must serialise data for TimingData and DeployDetails objects."""
178 start = datetime.utcnow()
179 end = datetime.utcnow()
180- seconds = int((end-start).total_seconds())
181+ seconds = int((end - start).total_seconds())
182 app_details = dict(app_name=1)
183 timing_data = gpr.TimingData(start, end)
184 deploy_details = gpr.DeployDetails(
185
186=== modified file 'tests/test_perfscale_longrunning.py'
187--- tests/test_perfscale_longrunning.py 2017-02-01 02:04:10 +0000
188+++ tests/test_perfscale_longrunning.py 2017-02-25 14:56:12 +0000
189@@ -27,6 +27,7 @@
190 machine=[],
191 region=None,
192 series=None,
193+ to=None,
194 upload_tools=False,
195 verbose=20,
196 deadline=None,
197
198=== modified file 'tests/test_scale_out.py'
199--- tests/test_scale_out.py 2017-01-20 21:11:17 +0000
200+++ tests/test_scale_out.py 2017-02-25 14:56:12 +0000
201@@ -52,6 +52,7 @@
202 region=None,
203 series=None,
204 temp_env_name='temp_name',
205+ to=None,
206 upload_tools=False,
207 verbose=logging.INFO,
208 deadline=None,
209@@ -79,6 +80,7 @@
210 region=None,
211 series=None,
212 temp_env_name='temp_name',
213+ to=None,
214 upload_tools=False,
215 verbose=logging.INFO,
216 deadline=None,
217@@ -120,6 +122,7 @@
218 region=None,
219 series='my_series',
220 temp_env_name='temp_name',
221+ to=None,
222 upload_tools=False,
223 verbose=logging.INFO,
224 deadline=None,
225
226=== modified file 'tests/test_utility.py'
227--- tests/test_utility.py 2017-02-22 18:02:19 +0000
228+++ tests/test_utility.py 2017-02-25 14:56:12 +0000
229@@ -309,7 +309,7 @@
230 juju_bin='/foo/juju', logs='/tmp/logs', series=None,
231 verbose=logging.INFO, agent_stream=None, keep_env=False,
232 upload_tools=False, bootstrap_host=None, machine=[], region=None,
233- deadline=None)
234+ deadline=None, to=None)
235 self.assertEqual(args, expected)
236
237 def test_positional_args_add_juju_bin_name(self):
238@@ -470,7 +470,7 @@
239 juju_bin='/foo/juju', logs='/tmp/logs', series=None,
240 verbose=logging.INFO, agent_stream=None, keep_env=False,
241 upload_tools=False, bootstrap_host=None, machine=[], region=None,
242- deadline=None)
243+ deadline=None, to=None)
244 self.assertEqual(args, expected)
245
246
247
248=== modified file 'utility.py'
249--- utility.py 2017-02-22 18:02:19 +0000
250+++ utility.py 2017-02-25 14:56:12 +0000
251@@ -289,6 +289,8 @@
252 default=logging.INFO, const=logging.DEBUG,
253 help='Verbose test harness output.')
254 parser.add_argument('--region', help='Override environment region.')
255+ parser.add_argument('--to', default=None,
256+ help='Place the controller at a location.')
257 parser.add_argument('--agent-url', action='store', default=None,
258 help='URL for retrieving agent binaries.')
259 parser.add_argument('--agent-stream', action='store', default=None,

Subscribers

People subscribed via source and target branches