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

Proposed by Celso Providelo on 2015-04-29
Status: Merged
Approved by: Celso Providelo on 2015-04-29
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 on 2015-04-29
Paul Larson 2015-04-29 Approve on 2015-04-29
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.
Paul Larson (pwlars) wrote :

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

review: Approve
Celso Providelo (cprov) wrote :

Paul,

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

Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'adt_cloud_worker/__init__.py'
2--- adt_cloud_worker/__init__.py 2015-04-28 16:09:47 +0000
3+++ adt_cloud_worker/__init__.py 2015-04-29 01:12:13 +0000
4@@ -213,7 +213,6 @@
5 :returns: A tuple of arguments.
6 """
7 adt_run_args = [
8- '-d',
9 '--apt-source', request_configuration['package_name'],
10 '--output-dir', request_configuration['result_dir'],
11 # XXX cprov 20150428: largest timeout values found in the original
12@@ -230,7 +229,6 @@
13 ]
14 adt_ssh_nova_args = [
15 '--',
16- '-d',
17 '--flavor', request_configuration['nova_flavor'],
18 '--image', request_configuration['nova_image'],
19 '--mirror', request_configuration['archive_mirror'],
20@@ -245,7 +243,7 @@
21
22 return (
23 adt_run_args +
24- ['---', 'ssh', '-s', get_uci_nova_path(), '-d'] +
25+ ['---', 'ssh', '-s', get_uci_nova_path()] +
26 adt_ssh_nova_args
27 )
28
29
30=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
31--- adt_cloud_worker/tests/test_cloud_worker.py 2015-04-28 16:09:47 +0000
32+++ adt_cloud_worker/tests/test_cloud_worker.py 2015-04-29 01:12:13 +0000
33@@ -66,7 +66,6 @@
34 )
35 self.assertEqual(
36 [
37- '-d',
38 '--apt-source', 'some_package_name',
39 '--output-dir', '/tmp/some/dir',
40 '--timeout-build=14400',
41@@ -75,9 +74,7 @@
42 '---',
43 'ssh',
44 '-s', get_uci_nova_path(),
45- '-d',
46 '--',
47- '-d',
48 '--flavor', 'some-nova-flavour',
49 '--image', 'some-nova-image',
50 '--mirror', 'some-archive-mirror',
51@@ -90,7 +87,6 @@
52 )
53 self.assertEqual(
54 [
55- '-d',
56 '--apt-source', 'some_package_name',
57 '--output-dir', '/tmp/some/dir',
58 '--timeout-build=14400',
59@@ -100,9 +96,7 @@
60 '---',
61 'ssh',
62 '-s', get_uci_nova_path(),
63- '-d',
64 '--',
65- '-d',
66 '--flavor', 'some-nova-flavour',
67 '--image', 'some-nova-image',
68 '--mirror', 'some-archive-mirror',

Subscribers

People subscribed via source and target branches