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

[Ryan Beisner]

Enable Mitaka amulet tests. Add missing service and relations to satisfy required interfaces and workload status. Wait for unit status instead of sleeping.

Addresses these bugs:

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

https://bugs.launchpad.net/charms/+source/keystone/+bug/1533854

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

charm_lint_check #17252 keystone-next for 1chb1n mp282493
    LINT OK: passed

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

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

charm_unit_test #16119 keystone-next for 1chb1n mp282493
    UNIT OK: passed

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

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

charm_amulet_test #8759 keystone-next for 1chb1n mp282493
    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/14490324/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8759/

[Ryan Beisner (1chb1n)]

FYI ^ Workload status is not satisfied in the existing test topology.

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

charm_lint_check #17261 keystone-next for 1chb1n mp282493
    LINT OK: passed

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

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

charm_unit_test #16127 keystone-next for 1chb1n mp282493
    UNIT OK: passed

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

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

charm_amulet_test #8768 keystone-next for 1chb1n mp282493
    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/14493340/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8768/

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

charm_amulet_test #8776 keystone-next for 1chb1n mp282493
    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/14496078/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8776/

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

charm_amulet_test #8781 keystone-next for 1chb1n mp282493
    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/14497906/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8781/

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

204. 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 #17334 keystone-next for 1chb1n mp282493
    LINT OK: passed

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

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

charm_unit_test #16195 keystone-next for 1chb1n mp282493
    UNIT OK: passed

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

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

charm_amulet_test #8789 keystone-next for 1chb1n mp282493
    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/14500402/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8789/

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

charm_amulet_test #8799 keystone-next for 1chb1n mp282493
    AMULET OK: passed

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

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

charm_amulet_test #8814 keystone-next for 1chb1n mp282493
    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/14512235/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8814/

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

charm_amulet_test #8817 keystone-next for 1chb1n mp282493
    AMULET OK: passed

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

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

205. By Ryan Beisner on 2016-01-20

rebase

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

charm_lint_check #17777 keystone-next for 1chb1n mp282493
    LINT OK: passed

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

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

charm_unit_test #16612 keystone-next for 1chb1n mp282493
    UNIT OK: passed

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

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

charm_amulet_test #8907 keystone-next for 1chb1n mp282493
    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/14581611/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8907/

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

charm_amulet_test #8923 keystone-next for 1chb1n mp282493
    AMULET OK: passed

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

[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 06:25:50 +0000
+++ tests/basic_deployment.py	2016-01-20 04:33:20 +0000
@@ -6,7 +6,6 @@
 
 import amulet
 import os
-import time
 import yaml
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
@@ -36,6 +35,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):
@@ -52,6 +56,7 @@
            """
         this_service = {'name': 'keystone'}
         other_services = [{'name': 'mysql'},
+                          {'name': 'rabbitmq-server'},  # satisfy wrkload stat
                           {'name': 'cinder'}]
         super(KeystoneBasicDeployment, self)._add_services(this_service,
                                                            other_services)
@@ -59,6 +64,8 @@
     def _add_relations(self):
         """Add all of the relations for the services."""
         relations = {'keystone:shared-db': 'mysql:shared-db',
+                     'cinder:shared-db': 'mysql:shared-db',
+                     'cinder:amqp': 'rabbitmq-server:amqp',
                      'cinder:identity-service': 'keystone:identity-service'}
         super(KeystoneBasicDeployment, self)._add_relations(relations)
 
@@ -113,9 +120,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 keystone admin
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',