snappy-proposed-image-tester

Merge lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename into lp:snappy-proposed-image-tester

  1. subst-and-rename
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 40
Merged at revision: 38
Proposed branch: lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename
Merge into: lp:snappy-proposed-image-tester
Diff against target: 274 lines (+35/-34)
12 files modified
README.rst (+5/-5)
called-by-tarmac.py (+2/-2)
setup.py (+5/-5)
snappy-proposed-image-tester.py (+1/-1)
snappy_proposed_image_tester/__init__.py (+8/-7)
snappy_proposed_image_tester/cloud.py (+1/-1)
snappy_proposed_image_tester/constants.py (+2/-2)
snappy_proposed_image_tester/queue.py (+2/-2)
snappy_proposed_image_tester/tests/__init__.py (+1/-1)
snappy_proposed_image_tester/tests/test_queue_integration.py (+3/-3)
snappy_proposed_image_tester/utils.py (+1/-1)
snappy_proposed_image_tester/worker.py (+4/-4)
To merge this branch: bzr merge lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename
Reviewer Review Type Date Requested Status
Paul Larson Approve
Francis Ginther Pending
Review via email: mp+260382@code.launchpad.net

This proposal supersedes a proposal from 2015-05-27.

Commit message

Renaming and substituting the module names to match the branch name and the charm requirements.

Description of the change

Renaming and substituting the module names to match the branch name and the charm requirements. This might be more than actually needed but just wanted to be safe.

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

One minor thing in the readme, otherwise +1

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote : Posted in a previous version of this proposal

Approved, yo!

review: Approve
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote : Posted in a previous version of this proposal
Download full text (25.7 KiB)

The attempt to merge lp:~psivaa/snappy-proposed-image-tester/subst-and-rename into lp:snappy-proposed-image-tester failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-image-testervpue635y/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-image-testervpue635y/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-swiftclient==2.4.0 (from -r requirements.txt (line 3))
Downloading/unpacking python-keystoneclient==1.3.0 (from -r requirements.txt (line 4))
Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking six>=1.5.2 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking requests>=1.1 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/simplejson/setup.py) egg_info for package simplejson

Downloading/unpacking futures>=2.1.3 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/Babel/setup.py) egg_info for package Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking argparse (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.config>=1.9.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.utils>=1.2.0 (from python-...

Revision history for this message
Francis Ginther (fginther) wrote : Posted in a previous version of this proposal

psivaa,

looks like a flake8 error:

snappy_proposed_image_tester/__init__.py:35:80: E501 line too long (81 > 79 characters)

Revision history for this message
Paul Larson (pwlars) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2015-05-26 16:25:20 +0000
3+++ README.rst 2015-05-27 21:15:12 +0000
4@@ -1,5 +1,5 @@
5-Core Image Tester
6-#################
7+Snappy Proposed Image Tester
8+############################
9
10 A micro-service uses adt-run to boot an ubuntu-core image and run some tests.
11
12@@ -8,7 +8,7 @@
13
14 Branch the code::
15
16- $ bzr branch lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration
17+ $ bzr branch lp:~canonical-ci-engineering/snappy-proposed-image-tester
18
19 Install the Service
20 ===================
21@@ -47,7 +47,7 @@
22
23 This service includes a custom adt-run ssh setup script called 'uci-nova'. This
24 is a shell script that exists in the root of the branch, and is called by the
25-core-image-tester service.
26+snappy-proposed-image-tester service.
27
28 You can run adt-run manually yourself, in order to replicate what the service
29 does. For example::
30@@ -77,7 +77,7 @@
31 The config file
32 ===============
33
34-The sample configuration file in 'core-service.conf'::
35+The sample configuration file in 'snappy-proposed-service.conf'::
36
37 [amqp]
38 uris = amqp://guest:guest@localhost:5672//
39
40=== modified file 'called-by-tarmac.py'
41--- called-by-tarmac.py 2015-04-07 19:54:41 +0000
42+++ called-by-tarmac.py 2015-05-27 21:15:12 +0000
43@@ -1,6 +1,6 @@
44 #!/usr/bin/env python3
45 #
46-# core-image-tester
47+# snappy-proposed-image-tester
48 # Copyright (C) 2015 Canonical
49 #
50 # This program is free software: you can redistribute it and/or modify
51@@ -33,7 +33,7 @@
52 import sys
53 import tempfile
54
55-SERVICE_NAME = 'core-image-tester'
56+SERVICE_NAME = 'snappy-proposed-image-tester'
57 VENV_DIR = 'venv-{}'.format(SERVICE_NAME)
58 PIP_DIR = 'pip-cache-'.format(SERVICE_NAME)
59 PIP_CACHE_BRANCH = 'lp:~canonical-ci-engineering/{}/' \
60
61=== modified file 'setup.py'
62--- setup.py 2015-04-07 19:54:41 +0000
63+++ setup.py 2015-05-27 21:15:12 +0000
64@@ -1,6 +1,6 @@
65 #!/usr/bin/env python3
66
67-# core-image-tester
68+# snappy-proposed-image-tester
69 # Copyright (C) 2015 Canonical
70 #
71 # This program is free software: you can redistribute it and/or modify
72@@ -30,14 +30,14 @@
73
74
75 setup(
76- name='core-image-tester',
77+ name='snappy-proposed-image-tester',
78 version=VERSION,
79 description=('A microservice for testing new ubuntu core images.'),
80 author='Canonical CI Engineering Team',
81 author_email='canonical-ci-engineering@lists.launchpad.net',
82- url='https://launchpad.net/core-image-tester',
83+ url='https://launchpad.net/snappy-proposed-image-tester',
84 license='GPLv3',
85 packages=find_packages(),
86- scripts=['core-image-tester.py'],
87- test_suite='core_image_tester.tests',
88+ scripts=['snappy-proposed-image-tester.py'],
89+ test_suite='snappy_proposed_image_tester.tests',
90 )
91
92=== renamed file 'core-image-tester.py' => 'snappy-proposed-image-tester.py'
93--- core-image-tester.py 2015-03-25 02:51:52 +0000
94+++ snappy-proposed-image-tester.py 2015-05-27 21:15:12 +0000
95@@ -1,6 +1,6 @@
96 #!/usr/bin/env python3
97
98-from core_image_tester import main
99+from snappy_proposed_image_tester import main
100
101
102 if __name__ == '__main__':
103
104=== renamed file 'core-service.conf' => 'snappy-proposed-service.conf'
105=== renamed directory 'core_image_tester' => 'snappy_proposed_image_tester'
106=== modified file 'snappy_proposed_image_tester/__init__.py'
107--- core_image_tester/__init__.py 2015-04-03 02:07:58 +0000
108+++ snappy_proposed_image_tester/__init__.py 2015-05-27 21:15:12 +0000
109@@ -1,4 +1,4 @@
110-# core-image-tester
111+# snappy-proposed-image-tester
112 # Copyright (C) 2015 Canonical
113 #
114 # This program is free software: you can redistribute it and/or modify
115@@ -22,21 +22,22 @@
116
117 from uservice_utils.logging import configure_service_logging
118
119-from core_image_tester import constants
120-from core_image_tester.queue import (
121+from snappy_proposed_image_tester import constants
122+from snappy_proposed_image_tester.queue import (
123 CoreImageTesterQueueMonitor,
124 create_connection_from_config,
125 CoreImageTestResultPublisher,
126 )
127-from core_image_tester.worker import CoreImageTesterWorker
128+from snappy_proposed_image_tester.worker import CoreImageTesterWorker
129
130
131 def read_config():
132- parser = argparse.ArgumentParser(description='Core image tester.')
133+ parser = argparse.ArgumentParser(
134+ description='Snappy proposed image tester.')
135 parser.add_argument(
136 '-c',
137 '--conf',
138- default='core-service.conf',
139+ default='snappy-proposed-service.conf',
140 help='Configuration file path'
141 )
142 args = parser.parse_args()
143@@ -50,7 +51,7 @@
144 def main():
145 config = read_config()
146 log_path = os.path.abspath(
147- os.path.join(__file__, '../../logs/core-image-tester.log'))
148+ os.path.join(__file__, '../../logs/snappy-proposed-image-tester.log'))
149 configure_service_logging(
150 log_path,
151 config['logstash'] if 'logstash' in config else None
152
153=== modified file 'snappy_proposed_image_tester/cloud.py'
154--- core_image_tester/cloud.py 2015-04-01 05:17:24 +0000
155+++ snappy_proposed_image_tester/cloud.py 2015-05-27 21:15:12 +0000
156@@ -1,4 +1,4 @@
157-# core-image-tester
158+# snappy-proposed-image-tester
159 # Copyright (C) 2015 Canonical
160 #
161 # This program is free software: you can redistribute it and/or modify
162
163=== modified file 'snappy_proposed_image_tester/constants.py'
164--- core_image_tester/constants.py 2015-05-22 21:06:35 +0000
165+++ snappy_proposed_image_tester/constants.py 2015-05-27 21:15:12 +0000
166@@ -1,4 +1,4 @@
167-# core-image-tester
168+# snappy-proposed-image-tester
169 # Copyright (C) 2015 Canonical
170 #
171 # This program is free software: you can redistribute it and/or modify
172@@ -23,7 +23,7 @@
173
174 SOLUTION_NAME = "snappy-proposed-migration"
175
176-SERVICE_NAME = "core-image-tester"
177+SERVICE_NAME = "snappy-proposed-image-tester"
178
179 HOSTNAME = socket.gethostname()
180
181
182=== modified file 'snappy_proposed_image_tester/queue.py'
183--- core_image_tester/queue.py 2015-05-21 21:41:49 +0000
184+++ snappy_proposed_image_tester/queue.py 2015-05-27 21:15:12 +0000
185@@ -1,4 +1,4 @@
186-# core-image-tester
187+# snappy-proposed-image-tester
188 # Copyright (C) 2015 Canonical
189 #
190 # This program is free software: you can redistribute it and/or modify
191@@ -22,7 +22,7 @@
192 import kombu
193 from kombu.mixins import ConsumerMixin
194
195-from core_image_tester import constants
196+from snappy_proposed_image_tester import constants
197
198 logger = logging.getLogger(__name__)
199
200
201=== modified file 'snappy_proposed_image_tester/tests/__init__.py'
202--- core_image_tester/tests/__init__.py 2015-03-26 20:18:59 +0000
203+++ snappy_proposed_image_tester/tests/__init__.py 2015-05-27 21:15:12 +0000
204@@ -1,4 +1,4 @@
205-# core-image-tester
206+# snappy-proposed-image-tester
207 # Copyright (C) 2015 Canonical
208 #
209 # This program is free software: you can redistribute it and/or modify
210
211=== modified file 'snappy_proposed_image_tester/tests/test_queue_integration.py'
212--- core_image_tester/tests/test_queue_integration.py 2015-05-22 21:15:02 +0000
213+++ snappy_proposed_image_tester/tests/test_queue_integration.py 2015-05-27 21:15:12 +0000
214@@ -1,4 +1,4 @@
215-# core-image-tester
216+# snappy-proposed-image-tester
217 # Copyright (C) 2015 Canonical
218 #
219 # This program is free software: you can redistribute it and/or modify
220@@ -21,8 +21,8 @@
221 from testtools import TestCase
222
223
224-from core_image_tester.queue import CoreImageTesterQueueMonitor
225-from core_image_tester import constants
226+from snappy_proposed_image_tester.queue import CoreImageTesterQueueMonitor
227+from snappy_proposed_image_tester import constants
228
229
230 class KombuQueueIntegrationTests(TestCase):
231
232=== modified file 'snappy_proposed_image_tester/utils.py'
233--- core_image_tester/utils.py 2015-03-31 02:52:08 +0000
234+++ snappy_proposed_image_tester/utils.py 2015-05-27 21:15:12 +0000
235@@ -1,4 +1,4 @@
236-# core-image-tester
237+# snappy-proposed-image-tester
238 # Copyright (C) 2015 Canonical
239 #
240 # This program is free software: you can redistribute it and/or modify
241
242=== modified file 'snappy_proposed_image_tester/worker.py'
243--- core_image_tester/worker.py 2015-05-26 16:29:22 +0000
244+++ snappy_proposed_image_tester/worker.py 2015-05-27 21:15:12 +0000
245@@ -1,4 +1,4 @@
246-# core-image-tester
247+# snappy-proposed-image-tester
248 # Copyright (C) 2015 Canonical
249 #
250 # This program is free software: you can redistribute it and/or modify
251@@ -24,12 +24,12 @@
252 import tarfile
253 import tempfile
254
255-from core_image_tester import (
256+from snappy_proposed_image_tester import (
257 cloud,
258 constants,
259 utils,
260 )
261-from core_image_tester.queue import MessageActions
262+from snappy_proposed_image_tester.queue import MessageActions
263
264
265 logger = logging.getLogger(__name__)
266@@ -97,7 +97,7 @@
267 extra=extra
268 )
269
270- container_name = "core-{}-{}-{}".format(
271+ container_name = "snappy-proposed-{}-{}-{}".format(
272 channel,
273 device,
274 image_name,

Subscribers

People subscribed via source and target branches

to all changes: