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

[Ryan Beisner]

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

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

charm_unit_test #16124 heat-next for 1chb1n mp282499
    UNIT OK: passed

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

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

charm_lint_check #17259 heat-next for 1chb1n mp282499
    LINT OK: passed

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

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

charm_amulet_test #8767 heat-next for 1chb1n mp282499
    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/14492599/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8767/

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

charm_amulet_test #8775 heat-next for 1chb1n mp282499
    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/14495863/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8775/

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

69. 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 #17332 heat-next for 1chb1n mp282499
    LINT OK: passed

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

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

charm_unit_test #16193 heat-next for 1chb1n mp282499
    UNIT OK: passed

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

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

charm_amulet_test #8787 heat-next for 1chb1n mp282499
    AMULET OK: passed

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

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

70. By Ryan Beisner on 2016-01-20

rebase

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

charm_unit_test #16615 heat-next for 1chb1n mp282499
    UNIT OK: passed

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

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

charm_lint_check #17780 heat-next for 1chb1n mp282499
    LINT OK: passed

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

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

charm_amulet_test #8911 heat-next for 1chb1n mp282499
    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/14584673/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8911/

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

71. By Ryan Beisner on 2016-01-21

update amulet test for systemd-based combos

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

charm_unit_test #16775 heat-next for 1chb1n mp282499
    UNIT OK: passed

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

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

charm_lint_check #17954 heat-next for 1chb1n mp282499
    LINT OK: passed

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

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

charm_amulet_test #8976 heat-next for 1chb1n mp282499
    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/14600585/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8976/

Unmerged revisions

71. By Ryan Beisner on 2016-01-21

update amulet test for systemd-based combos

70. By Ryan Beisner on 2016-01-20

rebase

69. By Ryan Beisner on 2016-01-14

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

68. By Ryan Beisner on 2016-01-13

flip all releases on for amulet tests

67. By Ryan Beisner on 2016-01-13

wait for unit status instead of sleeping before amulet tests

=== 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-06-12 13:50:03 +0000
+++ tests/basic_deployment.py	2016-01-22 19:20:49 +0000
@@ -4,7 +4,6 @@
 Basic heat functional test.
 """
 import amulet
-import time
 from heatclient.common import template_utils
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
@@ -41,6 +40,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):
@@ -107,9 +111,6 @@
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit before moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',
@@ -563,6 +564,7 @@
     def test_410_heat_stack_create_delete(self):
         """Create a heat stack from template, confirm that a corresponding
            nova compute resource is spawned, delete stack."""
+        u.log.debug('Creating, deleting heat stack (compute)...')
         self._image_create()
         self._keypair_create()
         self._stack_create()
@@ -585,19 +587,24 @@
         conf_file = '/etc/heat/heat.conf'
 
         # Services which are expected to restart upon config change
-        services = ['heat-api',
-                    'heat-api-cfn',
-                    'heat-engine']
+        services = {
+            'heat-api': conf_file,
+            'heat-api-cfn': conf_file,
+            'heat-engine': 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 = 30
-        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):
+            if not u.validate_service_config_changed(sentry, mtime, s,
+                                                     conf_file,
+                                                     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)