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

[Ryan Beisner]

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

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

charm_lint_check #17256 glance-next for 1chb1n mp282496
    LINT OK: passed

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

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

charm_unit_test #16123 glance-next for 1chb1n mp282496
    UNIT OK: passed

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

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

charm_amulet_test #8763 glance-next for 1chb1n mp282496
    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/14491525/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8763/

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

charm_amulet_test #8771 glance-next for 1chb1n mp282496
    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/14494564/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8771/

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

163. 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 #17335 glance-next for 1chb1n mp282496
    LINT OK: passed

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

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

charm_unit_test #16194 glance-next for 1chb1n mp282496
    UNIT OK: passed

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

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

charm_amulet_test #8788 glance-next for 1chb1n mp282496
    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/14500247/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8788/

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

charm_amulet_test #8798 glance-next for 1chb1n mp282496
    AMULET OK: passed

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

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

charm_amulet_test #8813 glance-next for 1chb1n mp282496
    AMULET OK: passed

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

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

charm_unit_test #16505 glance-next for 1chb1n mp282496
    UNIT OK: passed

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

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

charm_lint_check #17667 glance-next for 1chb1n mp282496
    LINT OK: passed

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

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

164. By Ryan Beisner on 2016-01-20

rebase

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

charm_lint_check #17778 glance-next for 1chb1n mp282496
    LINT OK: passed

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

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

charm_amulet_test #8908 glance-next for 1chb1n mp282496
    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/14582121/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8908/

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

charm_amulet_test #8924 glance-next for 1chb1n mp282496
    AMULET OK: passed

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

[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-09-28 07:51:23 +0000
+++ tests/basic_deployment.py	2016-01-20 04:33:58 +0000
@@ -6,7 +6,6 @@
 
 import amulet
 import os
-import time
 import yaml
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
@@ -40,6 +39,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 _assert_services(self, should_run):
@@ -119,9 +123,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',