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

[Celso Providelo]

Drop adt-run debug options.

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

[Paul Larson (pwlars)]

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

review: Approve

[Celso Providelo (cprov)]

Paul,

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

[Para Siva (psivaa)]

review: Approve

=== 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 @@
     :returns: A tuple of arguments.
     """
     adt_run_args = [
-        '-d',
         '--apt-source', request_configuration['package_name'],
         '--output-dir', request_configuration['result_dir'],
         # XXX cprov 20150428: largest timeout values found in the original
@@ -230,7 +229,6 @@
         ]
     adt_ssh_nova_args = [
         '--',
-        '-d',
         '--flavor', request_configuration['nova_flavor'],
         '--image', request_configuration['nova_image'],
         '--mirror', request_configuration['archive_mirror'],
@@ -245,7 +243,7 @@
 
     return (
         adt_run_args +
-        ['---', 'ssh', '-s', get_uci_nova_path(), '-d'] +
+        ['---', 'ssh', '-s', get_uci_nova_path()] +
         adt_ssh_nova_args
     )
 

=== 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 @@
         )
         self.assertEqual(
             [
-                '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
                 '--timeout-build=14400',
@@ -75,9 +74,7 @@
                 '---',
                 'ssh',
                 '-s', get_uci_nova_path(),
-                '-d',
                 '--',
-                '-d',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
                 '--mirror', 'some-archive-mirror',
@@ -90,7 +87,6 @@
         )
         self.assertEqual(
             [
-                '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
                 '--timeout-build=14400',
@@ -100,9 +96,7 @@
                 '---',
                 'ssh',
                 '-s', get_uci_nova_path(),
-                '-d',
                 '--',
-                '-d',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
                 '--mirror', 'some-archive-mirror',