Juju Charms Collection
swift-storage package

Merge lp:~1chb1n/charms/trusty/swift-storage/next-amulet-debug-and-makefile into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

  1. Trusty Tahr (14.04)
  2. next-amulet-debug-and-makefile
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 63
Proposed branch: lp:~1chb1n/charms/trusty/swift-storage/next-amulet-debug-and-makefile
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 228 lines (+61/-41)
13 files modified
Makefile (+1/-2)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+5/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+4/-1)
tests/016-basic-trusty-juno (+11/-0)
tests/017-basic-trusty-kilo (+11/-0)
tests/018-basic-utopic-juno (+9/-0)
tests/019-basic-vivid-kilo (+9/-0)
tests/11-basic-precise-folsom (+0/-11)
tests/12-basic-precise-grizzly (+0/-11)
tests/13-basic-precise-havana (+0/-11)
tests/basic_deployment.py (+1/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/swift-storage/next-amulet-debug-and-makefile
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+256572@code.launchpad.net

Description of the change

auto normalize amulet test definitions and amulet make targets; charm-helper sync.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3519 swift-storage-next for 1chb1n mp256572
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3519/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3307 swift-storage-next for 1chb1n mp256572
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3307/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3274 swift-storage-next for 1chb1n mp256572
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10835668/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3274/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3543 swift-storage-next for 1chb1n mp256572
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3543/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3331 swift-storage-next for 1chb1n mp256572
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3331/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3553 swift-storage-next for 1chb1n mp256572
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3553/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3341 swift-storage-next for 1chb1n mp256572
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3341/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3310 swift-storage-next for 1chb1n mp256572
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3310/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-09-29 21:14:05 +0000
3+++ Makefile 2015-04-16 21:40:06 +0000
4@@ -15,8 +15,7 @@
5 # coreycb note: The -v should only be temporary until Amulet sends
6 # raise_status() messages to stderr:
7 # https://bugs.launchpad.net/amulet/+bug/1320357
8- @juju test -v -p AMULET_HTTP_PROXY --timeout 900 \
9- 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse
10+ @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
11
12 bin/charm_helpers_sync.py:
13 @mkdir -p bin
14
15=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
16--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:28:51 +0000
17+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:40:06 +0000
18@@ -101,7 +101,8 @@
19 """
20 (self.precise_essex, self.precise_folsom, self.precise_grizzly,
21 self.precise_havana, self.precise_icehouse,
22- self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
23+ self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
24+ self.utopic_juno, self.vivid_kilo) = range(10)
25 releases = {
26 ('precise', None): self.precise_essex,
27 ('precise', 'cloud:precise-folsom'): self.precise_folsom,
28@@ -110,7 +111,9 @@
29 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
30 ('trusty', None): self.trusty_icehouse,
31 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
32- ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
33+ ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
34+ ('utopic', None): self.utopic_juno,
35+ ('vivid', None): self.vivid_kilo}
36 return releases[(self.series, self.openstack)]
37
38 def _get_openstack_release_string(self):
39
40=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
41--- hooks/charmhelpers/contrib/openstack/context.py 2015-04-16 10:28:51 +0000
42+++ hooks/charmhelpers/contrib/openstack/context.py 2015-04-16 21:40:06 +0000
43@@ -459,6 +459,11 @@
44
45 ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
46
47+ oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
48+ if oslo_messaging_flags:
49+ ctxt['oslo_messaging_flags'] = config_flags_parser(
50+ oslo_messaging_flags)
51+
52 if not context_complete(ctxt):
53 return {}
54
55
56=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
57--- hooks/charmhelpers/contrib/openstack/utils.py 2015-04-16 10:28:51 +0000
58+++ hooks/charmhelpers/contrib/openstack/utils.py 2015-04-16 21:40:06 +0000
59@@ -524,9 +524,10 @@
60 projects = yaml.load(projects_yaml)
61 _git_validate_projects_yaml(projects, core_project)
62
63+ old_environ = dict(os.environ)
64+
65 if 'http_proxy' in projects.keys():
66 os.environ['http_proxy'] = projects['http_proxy']
67-
68 if 'https_proxy' in projects.keys():
69 os.environ['https_proxy'] = projects['https_proxy']
70
71@@ -544,6 +545,8 @@
72 repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
73 update_requirements=True)
74
75+ os.environ = old_environ
76+
77
78 def _git_validate_projects_yaml(projects, core_project):
79 """
80
81=== renamed file 'tests/10-basic-precise-essex' => 'tests/010-basic-precise-essex'
82=== renamed file 'tests/14-basic-precise-icehouse' => 'tests/014-basic-precise-icehouse'
83=== renamed file 'tests/15-basic-trusty-icehouse' => 'tests/015-basic-trusty-icehouse'
84=== added file 'tests/016-basic-trusty-juno'
85--- tests/016-basic-trusty-juno 1970-01-01 00:00:00 +0000
86+++ tests/016-basic-trusty-juno 2015-04-16 21:40:06 +0000
87@@ -0,0 +1,11 @@
88+#!/usr/bin/python
89+
90+"""Amulet tests on a basic swift-storage deployment on trusty-juno."""
91+
92+from basic_deployment import SwiftStorageBasicDeployment
93+
94+if __name__ == '__main__':
95+ deployment = SwiftStorageBasicDeployment(series='trusty',
96+ openstack='cloud:trusty-juno',
97+ source='cloud:trusty-updates/juno')
98+ deployment.run_tests()
99
100=== added file 'tests/017-basic-trusty-kilo'
101--- tests/017-basic-trusty-kilo 1970-01-01 00:00:00 +0000
102+++ tests/017-basic-trusty-kilo 2015-04-16 21:40:06 +0000
103@@ -0,0 +1,11 @@
104+#!/usr/bin/python
105+
106+"""Amulet tests on a basic swift-storage deployment on trusty-kilo."""
107+
108+from basic_deployment import SwiftStorageBasicDeployment
109+
110+if __name__ == '__main__':
111+ deployment = SwiftStorageBasicDeployment(series='trusty',
112+ openstack='cloud:trusty-kilo',
113+ source='cloud:trusty-updates/kilo')
114+ deployment.run_tests()
115
116=== added file 'tests/018-basic-utopic-juno'
117--- tests/018-basic-utopic-juno 1970-01-01 00:00:00 +0000
118+++ tests/018-basic-utopic-juno 2015-04-16 21:40:06 +0000
119@@ -0,0 +1,9 @@
120+#!/usr/bin/python
121+
122+"""Amulet tests on a basic swift-storage deployment on utopic-juno."""
123+
124+from basic_deployment import SwiftStorageBasicDeployment
125+
126+if __name__ == '__main__':
127+ deployment = SwiftStorageBasicDeployment(series='utopic')
128+ deployment.run_tests()
129
130=== added file 'tests/019-basic-vivid-kilo'
131--- tests/019-basic-vivid-kilo 1970-01-01 00:00:00 +0000
132+++ tests/019-basic-vivid-kilo 2015-04-16 21:40:06 +0000
133@@ -0,0 +1,9 @@
134+#!/usr/bin/python
135+
136+"""Amulet tests on a basic swift-storage deployment on vivid-kilo."""
137+
138+from basic_deployment import SwiftStorageBasicDeployment
139+
140+if __name__ == '__main__':
141+ deployment = SwiftStorageBasicDeployment(series='vivid')
142+ deployment.run_tests()
143
144=== removed file 'tests/11-basic-precise-folsom'
145--- tests/11-basic-precise-folsom 2014-07-11 16:41:12 +0000
146+++ tests/11-basic-precise-folsom 1970-01-01 00:00:00 +0000
147@@ -1,11 +0,0 @@
148-#!/usr/bin/python
149-
150-"""Amulet tests on a basic swift-storage deployment on precise-folsom."""
151-
152-from basic_deployment import SwiftStorageBasicDeployment
153-
154-if __name__ == '__main__':
155- deployment = SwiftStorageBasicDeployment(series='precise',
156- openstack='cloud:precise-folsom',
157- source='cloud:precise-updates/folsom')
158- deployment.run_tests()
159
160=== removed file 'tests/12-basic-precise-grizzly'
161--- tests/12-basic-precise-grizzly 2014-07-11 16:41:12 +0000
162+++ tests/12-basic-precise-grizzly 1970-01-01 00:00:00 +0000
163@@ -1,11 +0,0 @@
164-#!/usr/bin/python
165-
166-"""Amulet tests on a basic swift-storage deployment on precise-grizzly."""
167-
168-from basic_deployment import SwiftStorageBasicDeployment
169-
170-if __name__ == '__main__':
171- deployment = SwiftStorageBasicDeployment(series='precise',
172- openstack='cloud:precise-grizzly',
173- source='cloud:precise-updates/grizzly')
174- deployment.run_tests()
175
176=== removed file 'tests/13-basic-precise-havana'
177--- tests/13-basic-precise-havana 2014-07-11 16:41:12 +0000
178+++ tests/13-basic-precise-havana 1970-01-01 00:00:00 +0000
179@@ -1,11 +0,0 @@
180-#!/usr/bin/python
181-
182-"""Amulet tests on a basic swift-storage deployment on precise-havana."""
183-
184-from basic_deployment import SwiftStorageBasicDeployment
185-
186-if __name__ == '__main__':
187- deployment = SwiftStorageBasicDeployment(series='precise',
188- openstack='cloud:precise-havana',
189- source='cloud:precise-updates/havana')
190- deployment.run_tests()
191
192=== modified file 'tests/basic_deployment.py'
193--- tests/basic_deployment.py 2015-02-26 10:22:55 +0000
194+++ tests/basic_deployment.py 2015-04-16 21:40:06 +0000
195@@ -14,7 +14,7 @@
196 )
197
198 # Use DEBUG to turn on debug logging
199-u = OpenStackAmuletUtils(ERROR)
200+u = OpenStackAmuletUtils(DEBUG)
201
202
203 class SwiftStorageBasicDeployment(OpenStackAmuletDeployment):
204
205=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
206--- tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:28:51 +0000
207+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:40:06 +0000
208@@ -101,7 +101,8 @@
209 """
210 (self.precise_essex, self.precise_folsom, self.precise_grizzly,
211 self.precise_havana, self.precise_icehouse,
212- self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
213+ self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
214+ self.utopic_juno, self.vivid_kilo) = range(10)
215 releases = {
216 ('precise', None): self.precise_essex,
217 ('precise', 'cloud:precise-folsom'): self.precise_folsom,
218@@ -110,7 +111,9 @@
219 ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
220 ('trusty', None): self.trusty_icehouse,
221 ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
222- ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
223+ ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
224+ ('utopic', None): self.utopic_juno,
225+ ('vivid', None): self.vivid_kilo}
226 return releases[(self.series, self.openstack)]
227
228 def _get_openstack_release_string(self):

Subscribers

People subscribed via source and target branches