Merge lp:~1chb1n/charms/trusty/nova-compute/next-amulet-1602 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by Ryan Beisner on 2016-02-13
Status: Merged
Merged at revision: 196
Proposed branch: lp:~1chb1n/charms/trusty/nova-compute/next-amulet-1602
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 85 lines (+21/-27)
1 file modified
tests/basic_deployment.py (+21/-27)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/nova-compute/next-amulet-1602
Reviewer Review Type Date Requested Status
OpenStack Charmers 2016-02-13 Pending
Review via email: mp+285950@code.launchpad.net

Description of the change

Update amulet test definitions

To post a comment you must log in.
196. By Ryan Beisner on 2016-02-13

Update

charm_lint_check #452 nova-compute-next for 1chb1n mp285950
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/452/

charm_unit_test #371 nova-compute-next for 1chb1n mp285950
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/371/

charm_amulet_test #168 nova-compute-next for 1chb1n mp285950
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15033630/
Build: http://10.245.162.36:8080/job/charm_amulet_test/168/

197. By Ryan Beisner on 2016-02-13

Disable xenial test, not quite ready

charm_lint_check #460 nova-compute-next for 1chb1n mp285950
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/460/

charm_unit_test #380 nova-compute-next for 1chb1n mp285950
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/380/

charm_amulet_test #177 nova-compute-next for 1chb1n mp285950
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/177/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
2=== modified file 'tests/basic_deployment.py'
3--- tests/basic_deployment.py 2015-10-16 05:42:25 +0000
4+++ tests/basic_deployment.py 2016-02-13 03:28:45 +0000
5@@ -411,7 +411,7 @@
6 db_nc_rel['nova_password'],
7 db_nc_rel['db_host'],
8 'nova')
9-
10+ # Common conf across all releases
11 expected = {
12 'DEFAULT': {
13 'dhcpbridge_flagfile': '/etc/nova/nova.conf',
14@@ -424,51 +424,45 @@
15 'ec2_private_dns_show_ip': 'True',
16 'api_paste_config': '/etc/nova/api-paste.ini',
17 'enabled_apis': 'ec2,osapi_compute,metadata',
18- 'auth_strategy': 'keystone',
19 'flat_interface': 'eth1',
20 'network_manager': 'nova.network.manager.FlatDHCPManager',
21 'volume_api_class': 'nova.volume.cinder.API',
22+ 'auth_strategy': 'keystone'
23 }
24 }
25+
26 if self._get_openstack_release() < self.trusty_kilo:
27- d = 'DEFAULT'
28- expected[d]['lock_path'] = '/var/lock/nova'
29- expected[d]['libvirt_use_virtio_for_bridges'] = 'True'
30- expected[d]['compute_driver'] = 'libvirt.LibvirtDriver'
31- expected[d]['sql_connection'] = db_uri
32- expected[d]['rabbit_userid'] = 'nova'
33- expected[d]['rabbit_virtual_host'] = 'openstack'
34- expected[d]['rabbit_password'] = rmq_nc_rel['password']
35- expected[d]['rabbit_host'] = rmq_nc_rel['hostname']
36- expected[d]['glance_api_servers'] = gl_nc_rel['glance-api-server']
37+ # Juno or earlier
38+ expected['DEFAULT'].update({
39+ 'lock_path': '/var/lock/nova',
40+ 'libvirt_use_virtio_for_bridges': 'True',
41+ 'compute_driver': 'libvirt.LibvirtDriver',
42+ 'sql_connection': db_uri,
43+ 'rabbit_userid': 'nova',
44+ 'rabbit_virtual_host': 'openstack',
45+ 'rabbit_password': rmq_nc_rel['password'],
46+ 'rabbit_host': rmq_nc_rel['hostname'],
47+ 'glance_api_servers': gl_nc_rel['glance-api-server']
48+ })
49 else:
50- oslo_concurrency = {
51+ # Kilo or later
52+ expected.update({
53 'oslo_concurrency': {
54 'lock_path': '/var/lock/nova'
55- }
56- }
57- database = {
58+ },
59 'database': {
60 'connection': db_uri
61- }
62- }
63- oslo_messaging_rabbit = {
64+ },
65 'oslo_messaging_rabbit': {
66 'rabbit_userid': 'nova',
67 'rabbit_virtual_host': 'openstack',
68 'rabbit_password': rmq_nc_rel['password'],
69 'rabbit_host': rmq_nc_rel['hostname'],
70- }
71- }
72- glance = {
73+ },
74 'glance': {
75 'api_servers': gl_nc_rel['glance-api-server']
76 }
77- }
78- expected.update(oslo_concurrency)
79- expected.update(database)
80- expected.update(oslo_messaging_rabbit)
81- expected.update(glance)
82+ })
83
84 for section, pairs in expected.iteritems():
85 ret = u.validate_config_data(unit, conf, section, pairs)

Subscribers

People subscribed via source and target branches