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

[Ryan Beisner]

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

Addresses these bugs:

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[lp:~1chb1n/charms/trusty/cinder/next-amulet-mitaka-1601]

146. By Ryan Beisner on 2016-01-14

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[lp:~1chb1n/charms/trusty/cinder/next-amulet-mitaka-1601]

147. By Ryan Beisner on 2016-01-20

rebase

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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)]

Looks good, merging.

review: Approve

=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-08-03 20:18:39 +0000
+++ tests/basic_deployment.py	2016-01-20 04:39:26 +0000
@@ -2,7 +2,6 @@
 
 import amulet
 import os
-import time
 import yaml
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
@@ -35,6 +34,11 @@
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):
@@ -120,9 +124,6 @@
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit original moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',
@@ -670,22 +671,25 @@
         conf_file = '/etc/cinder/cinder.conf'
 
         # Services which are expected to restart upon config change
-        services = [
-            'cinder-api',
-            'cinder-scheduler',
-            'cinder-volume'
-        ]
+        services = {
+            'cinder-api': conf_file,
+            'cinder-scheduler': conf_file,
+            'cinder-volume': conf_file
+        }
 
         # Make config change, check for service restarts
         u.log.debug('Making config change on {}...'.format(juju_service))
+        mtime = u.get_sentry_time(sentry)
         self.d.configure(juju_service, set_alternate)
 
         sleep_time = 40
-        for s in services:
+        for s, conf_file in services.iteritems():
             u.log.debug("Checking that service restarted: {}".format(s))
-            if not u.service_restarted(sentry, s,
-                                       conf_file, sleep_time=sleep_time,
-                                       pgrep_full=True):
+            if not u.validate_service_config_changed(sentry, mtime, s,
+                                                     conf_file,
+                                                     retry_count=4,
+                                                     retry_sleep_time=20,
+                                                     sleep_time=sleep_time):
                 self.d.configure(juju_service, set_default)
                 msg = "service {} didn't restart after config change".format(s)
                 amulet.raise_status(amulet.FAIL, msg=msg)