Juju Charms Collection
nova-cloud-controller package

Merge lp:~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-debug-and-makefile into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/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: 156
Proposed branch: lp:~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-debug-and-makefile
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 228 lines (+64/-49)
12 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 (+12/-0)
tests/017-basic-trusty-kilo (+12/-0)
tests/018-basic-utopic-juno (+10/-0)
tests/019-basic-vivid-kilo (+10/-0)
tests/11-basic-precise-folsom (+0/-18)
tests/12-basic-precise-grizzly (+0/-12)
tests/13-basic-precise-havana (+0/-12)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-cloud-controller/next-amulet-debug-and-makefile
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+256577@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 #3534 nova-cloud-controller-next for 1chb1n mp256577
    LINT OK: passed

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

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

charm_unit_test #3322 nova-cloud-controller-next for 1chb1n mp256577
    UNIT OK: passed

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

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

charm_amulet_test #3289 nova-cloud-controller-next for 1chb1n mp256577
    AMULET FAIL: amulet-test failed

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

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

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

charm_lint_check #3573 nova-cloud-controller-next for 1chb1n mp256577
    LINT OK: passed

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

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

charm_unit_test #3361 nova-cloud-controller-next for 1chb1n mp256577
    UNIT OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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

charm_amulet_test #3330 nova-cloud-controller-next for 1chb1n mp256577
    AMULET FAIL: amulet-test failed

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

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

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

charm_amulet_test #3358 nova-cloud-controller-next for 1chb1n mp256577
    AMULET OK: passed

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

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:03:48 +0000
3+++ Makefile 2015-04-16 21:46:13 +0000
4@@ -18,8 +18,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 sync: bin/charm_helpers_sync.py
13 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
14
15=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
16--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:25:41 +0000
17+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:46:13 +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-13 08:51:41 +0000
42+++ hooks/charmhelpers/contrib/openstack/context.py 2015-04-16 21:46:13 +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-13 08:51:41 +0000
58+++ hooks/charmhelpers/contrib/openstack/utils.py 2015-04-16 21:46:13 +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:46:13 +0000
87@@ -0,0 +1,12 @@
88+#!/usr/bin/python
89+
90+"""Amulet tests on a basic nova cloud controller deployment on
91+ trusty-juno."""
92+
93+from basic_deployment import NovaCCBasicDeployment
94+
95+if __name__ == '__main__':
96+ deployment = NovaCCBasicDeployment(series='trusty',
97+ openstack='cloud:trusty-juno',
98+ source='cloud:trusty-updates/juno')
99+ deployment.run_tests()
100
101=== added file 'tests/017-basic-trusty-kilo'
102--- tests/017-basic-trusty-kilo 1970-01-01 00:00:00 +0000
103+++ tests/017-basic-trusty-kilo 2015-04-16 21:46:13 +0000
104@@ -0,0 +1,12 @@
105+#!/usr/bin/python
106+
107+"""Amulet tests on a basic nova cloud controller deployment on
108+ trusty-kilo."""
109+
110+from basic_deployment import NovaCCBasicDeployment
111+
112+if __name__ == '__main__':
113+ deployment = NovaCCBasicDeployment(series='trusty',
114+ openstack='cloud:trusty-kilo',
115+ source='cloud:trusty-updates/kilo')
116+ deployment.run_tests()
117
118=== added file 'tests/018-basic-utopic-juno'
119--- tests/018-basic-utopic-juno 1970-01-01 00:00:00 +0000
120+++ tests/018-basic-utopic-juno 2015-04-16 21:46:13 +0000
121@@ -0,0 +1,10 @@
122+#!/usr/bin/python
123+
124+"""Amulet tests on a basic nova cloud controller deployment on
125+ utopic-juno."""
126+
127+from basic_deployment import NovaCCBasicDeployment
128+
129+if __name__ == '__main__':
130+ deployment = NovaCCBasicDeployment(series='utopic')
131+ deployment.run_tests()
132
133=== added file 'tests/019-basic-vivid-kilo'
134--- tests/019-basic-vivid-kilo 1970-01-01 00:00:00 +0000
135+++ tests/019-basic-vivid-kilo 2015-04-16 21:46:13 +0000
136@@ -0,0 +1,10 @@
137+#!/usr/bin/python
138+
139+"""Amulet tests on a basic nova cloud controller deployment on
140+ vivid-kilo."""
141+
142+from basic_deployment import NovaCCBasicDeployment
143+
144+if __name__ == '__main__':
145+ deployment = NovaCCBasicDeployment(series='vivid')
146+ deployment.run_tests()
147
148=== removed file 'tests/11-basic-precise-folsom'
149--- tests/11-basic-precise-folsom 2014-07-11 17:34:39 +0000
150+++ tests/11-basic-precise-folsom 1970-01-01 00:00:00 +0000
151@@ -1,18 +0,0 @@
152-#!/usr/bin/python
153-
154-"""Amulet tests on a basic nova cloud controller deployment on
155- precise-folsom."""
156-
157-import amulet
158-from basic_deployment import NovaCCBasicDeployment
159-
160-if __name__ == '__main__':
161- # NOTE(coreycb): Skipping failing test until resolved. 'nova-manage db sync'
162- # fails in shared-db-relation-changed (only fails on folsom)
163- message = "Skipping failing test until resolved"
164- amulet.raise_status(amulet.SKIP, msg=message)
165-
166- deployment = NovaCCBasicDeployment(series='precise',
167- openstack='cloud:precise-folsom',
168- source='cloud:precise-updates/folsom')
169- deployment.run_tests()
170
171=== removed file 'tests/12-basic-precise-grizzly'
172--- tests/12-basic-precise-grizzly 2014-07-11 17:34:39 +0000
173+++ tests/12-basic-precise-grizzly 1970-01-01 00:00:00 +0000
174@@ -1,12 +0,0 @@
175-#!/usr/bin/python
176-
177-"""Amulet tests on a basic nova cloud controller deployment on
178- precise-grizzly."""
179-
180-from basic_deployment import NovaCCBasicDeployment
181-
182-if __name__ == '__main__':
183- deployment = NovaCCBasicDeployment(series='precise',
184- openstack='cloud:precise-grizzly',
185- source='cloud:precise-updates/grizzly')
186- deployment.run_tests()
187
188=== removed file 'tests/13-basic-precise-havana'
189--- tests/13-basic-precise-havana 2014-07-11 17:34:39 +0000
190+++ tests/13-basic-precise-havana 1970-01-01 00:00:00 +0000
191@@ -1,12 +0,0 @@
192-#!/usr/bin/python
193-
194-"""Amulet tests on a basic nova cloud controller deployment on
195- precise-havana."""
196-
197-from basic_deployment import NovaCCBasicDeployment
198-
199-if __name__ == '__main__':
200- deployment = NovaCCBasicDeployment(series='precise',
201- openstack='cloud:precise-havana',
202- source='cloud:precise-updates/havana')
203- deployment.run_tests()
204
205=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
206--- tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 10:25:41 +0000
207+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-04-16 21:46:13 +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