Merge lp:~1chb1n/charms/trusty/cinder/next-amulet-mitaka-1601 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

Proposed by Ryan Beisner on 2016-01-13
Status: Merged
Merged at revision: 144
Proposed branch: lp:~1chb1n/charms/trusty/cinder/next-amulet-mitaka-1601
Merge into: lp:~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 71 lines (+17/-13)
1 file modified
tests/basic_deployment.py (+17/-13)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/cinder/next-amulet-mitaka-1601
Reviewer Review Type Date Requested Status
David Ames 2016-01-13 Approve on 2016-01-21
Review via email: mp+282519@code.launchpad.net

Description of the change

Enable Mitaka amulet tests. Wait for unit status instead of sleeping.

Addresses these bugs:

https://bugs.launchpad.net/ubuntu/+source/neutron-openvswitch/+bug/1474030

To post a comment you must log in.

charm_lint_check #17262 cinder-next for 1chb1n mp282519
    LINT OK: passed

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

charm_unit_test #16128 cinder-next for 1chb1n mp282519
    UNIT OK: passed

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

charm_amulet_test #8769 cinder-next for 1chb1n mp282519
    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/14493547/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8769/

charm_amulet_test #8777 cinder-next for 1chb1n mp282519
    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/14496751/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8777/

146. By Ryan Beisner on 2016-01-14

disable xenial test, not quite yet juju-deployable with current tools/streams

charm_lint_check #17328 cinder-next for 1chb1n mp282519
    LINT OK: passed

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

charm_unit_test #16190 cinder-next for 1chb1n mp282519
    UNIT OK: passed

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

charm_amulet_test #8784 cinder-next for 1chb1n mp282519
    AMULET OK: passed

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

147. By Ryan Beisner on 2016-01-20

rebase

charm_lint_check #17779 cinder-next for 1chb1n mp282519
    LINT OK: passed

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

charm_unit_test #16621 cinder-next for 1chb1n mp282519
    UNIT OK: passed

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

charm_amulet_test #8912 cinder-next for 1chb1n mp282519
    AMULET OK: passed

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

David Ames (thedac) wrote :

Looks good, merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
2=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
3=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
4=== modified file 'tests/basic_deployment.py'
5--- tests/basic_deployment.py 2015-08-03 20:18:39 +0000
6+++ tests/basic_deployment.py 2016-01-20 04:39:26 +0000
7@@ -2,7 +2,6 @@
8
9 import amulet
10 import os
11-import time
12 import yaml
13
14 from charmhelpers.contrib.openstack.amulet.deployment import (
15@@ -35,6 +34,11 @@
16 self._add_relations()
17 self._configure_services()
18 self._deploy()
19+
20+ u.log.info('Waiting on extended status checks...')
21+ exclude_services = ['mysql']
22+ self._auto_wait_for_status(exclude_services=exclude_services)
23+
24 self._initialize_tests()
25
26 def _add_services(self):
27@@ -120,9 +124,6 @@
28 u.log.debug('openstack release str: {}'.format(
29 self._get_openstack_release_string()))
30
31- # Let things settle a bit original moving forward
32- time.sleep(30)
33-
34 # Authenticate admin with keystone
35 self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
36 user='admin',
37@@ -670,22 +671,25 @@
38 conf_file = '/etc/cinder/cinder.conf'
39
40 # Services which are expected to restart upon config change
41- services = [
42- 'cinder-api',
43- 'cinder-scheduler',
44- 'cinder-volume'
45- ]
46+ services = {
47+ 'cinder-api': conf_file,
48+ 'cinder-scheduler': conf_file,
49+ 'cinder-volume': conf_file
50+ }
51
52 # Make config change, check for service restarts
53 u.log.debug('Making config change on {}...'.format(juju_service))
54+ mtime = u.get_sentry_time(sentry)
55 self.d.configure(juju_service, set_alternate)
56
57 sleep_time = 40
58- for s in services:
59+ for s, conf_file in services.iteritems():
60 u.log.debug("Checking that service restarted: {}".format(s))
61- if not u.service_restarted(sentry, s,
62- conf_file, sleep_time=sleep_time,
63- pgrep_full=True):
64+ if not u.validate_service_config_changed(sentry, mtime, s,
65+ conf_file,
66+ retry_count=4,
67+ retry_sleep_time=20,
68+ sleep_time=sleep_time):
69 self.d.configure(juju_service, set_default)
70 msg = "service {} didn't restart after config change".format(s)
71 amulet.raise_status(amulet.FAIL, msg=msg)

Subscribers

People subscribed via source and target branches