Merge lp:~cprov/adt-cloud-worker/no-debug into lp:adt-cloud-worker

Proposed by Celso Providelo
Status: Merged
Approved by: Celso Providelo
Approved revision: 42
Merged at revision: 43
Proposed branch: lp:~cprov/adt-cloud-worker/no-debug
Merge into: lp:adt-cloud-worker
Diff against target: 68 lines (+1/-9)
2 files modified
adt_cloud_worker/__init__.py (+1/-3)
adt_cloud_worker/tests/test_cloud_worker.py (+0/-6)
To merge this branch: bzr merge lp:~cprov/adt-cloud-worker/no-debug
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
Paul Larson Approve
Review via email: mp+257712@code.launchpad.net

Commit message

Drop adt-run debug options.

Description of the change

Drop adt-run debug options now that we have exercise this enough, logs will be much more readable.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

I thought this had been done already, but I'm probably thinking of the core worker ones.

review: Approve
Revision history for this message
Celso Providelo (cprov) wrote :

Paul,

Thanks for the review. I've done the same cleanup on the core-image-tester while in Austin.

Revision history for this message
Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py 2015-04-28 16:09:47 +0000
+++ adt_cloud_worker/__init__.py 2015-04-29 01:12:13 +0000
@@ -213,7 +213,6 @@
213 :returns: A tuple of arguments.213 :returns: A tuple of arguments.
214 """214 """
215 adt_run_args = [215 adt_run_args = [
216 '-d',
217 '--apt-source', request_configuration['package_name'],216 '--apt-source', request_configuration['package_name'],
218 '--output-dir', request_configuration['result_dir'],217 '--output-dir', request_configuration['result_dir'],
219 # XXX cprov 20150428: largest timeout values found in the original218 # XXX cprov 20150428: largest timeout values found in the original
@@ -230,7 +229,6 @@
230 ]229 ]
231 adt_ssh_nova_args = [230 adt_ssh_nova_args = [
232 '--',231 '--',
233 '-d',
234 '--flavor', request_configuration['nova_flavor'],232 '--flavor', request_configuration['nova_flavor'],
235 '--image', request_configuration['nova_image'],233 '--image', request_configuration['nova_image'],
236 '--mirror', request_configuration['archive_mirror'],234 '--mirror', request_configuration['archive_mirror'],
@@ -245,7 +243,7 @@
245243
246 return (244 return (
247 adt_run_args +245 adt_run_args +
248 ['---', 'ssh', '-s', get_uci_nova_path(), '-d'] +246 ['---', 'ssh', '-s', get_uci_nova_path()] +
249 adt_ssh_nova_args247 adt_ssh_nova_args
250 )248 )
251249
252250
=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
--- adt_cloud_worker/tests/test_cloud_worker.py 2015-04-28 16:09:47 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py 2015-04-29 01:12:13 +0000
@@ -66,7 +66,6 @@
66 )66 )
67 self.assertEqual(67 self.assertEqual(
68 [68 [
69 '-d',
70 '--apt-source', 'some_package_name',69 '--apt-source', 'some_package_name',
71 '--output-dir', '/tmp/some/dir',70 '--output-dir', '/tmp/some/dir',
72 '--timeout-build=14400',71 '--timeout-build=14400',
@@ -75,9 +74,7 @@
75 '---',74 '---',
76 'ssh',75 'ssh',
77 '-s', get_uci_nova_path(),76 '-s', get_uci_nova_path(),
78 '-d',
79 '--',77 '--',
80 '-d',
81 '--flavor', 'some-nova-flavour',78 '--flavor', 'some-nova-flavour',
82 '--image', 'some-nova-image',79 '--image', 'some-nova-image',
83 '--mirror', 'some-archive-mirror',80 '--mirror', 'some-archive-mirror',
@@ -90,7 +87,6 @@
90 )87 )
91 self.assertEqual(88 self.assertEqual(
92 [89 [
93 '-d',
94 '--apt-source', 'some_package_name',90 '--apt-source', 'some_package_name',
95 '--output-dir', '/tmp/some/dir',91 '--output-dir', '/tmp/some/dir',
96 '--timeout-build=14400',92 '--timeout-build=14400',
@@ -100,9 +96,7 @@
100 '---',96 '---',
101 'ssh',97 'ssh',
102 '-s', get_uci_nova_path(),98 '-s', get_uci_nova_path(),
103 '-d',
104 '--',99 '--',
105 '-d',
106 '--flavor', 'some-nova-flavour',100 '--flavor', 'some-nova-flavour',
107 '--image', 'some-nova-image',101 '--image', 'some-nova-image',
108 '--mirror', 'some-archive-mirror',102 '--mirror', 'some-archive-mirror',

Subscribers

People subscribed via source and target branches