From ab1f006f7074140f974f2c653a4e08cac442e8c5 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 13 Jan 2016 19:11:56 +0000 Subject: [PATCH 1/4] wait for status instead of sleep --- tests/basic_deployment.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 15110330..88586eb5 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -6,7 +6,6 @@ Basic keystone amulet functional tests. import amulet import os -import time import yaml from charmhelpers.contrib.openstack.amulet.deployment import ( @@ -36,6 +35,11 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment): 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): @@ -113,9 +117,6 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment): 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', From d35844665436e84b30607faa4ade117f4a6a6b37 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 13 Jan 2016 19:12:20 +0000 Subject: [PATCH 2/4] flip all releases on for amulet tests --- tests/018-basic-trusty-liberty | 0 tests/019-basic-trusty-mitaka | 0 tests/020-basic-wily-liberty | 0 tests/021-basic-xenial-mitaka | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/018-basic-trusty-liberty mode change 100644 => 100755 tests/019-basic-trusty-mitaka mode change 100644 => 100755 tests/020-basic-wily-liberty mode change 100644 => 100755 tests/021-basic-xenial-mitaka diff --git a/tests/018-basic-trusty-liberty b/tests/018-basic-trusty-liberty old mode 100644 new mode 100755 diff --git a/tests/019-basic-trusty-mitaka b/tests/019-basic-trusty-mitaka old mode 100644 new mode 100755 diff --git a/tests/020-basic-wily-liberty b/tests/020-basic-wily-liberty old mode 100644 new mode 100755 diff --git a/tests/021-basic-xenial-mitaka b/tests/021-basic-xenial-mitaka old mode 100644 new mode 100755 From 688ffad599b4ccb54271a33eaeb274adc6a89f0f Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 13 Jan 2016 21:33:59 +0000 Subject: [PATCH 3/4] add services and relations to satisfy required interfaces / workload status --- tests/basic_deployment.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 88586eb5..258a7510 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -56,6 +56,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment): """ 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) @@ -63,6 +64,8 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment): 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) From 01e3b27732f419bb98d040b21b68c122902528b6 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Thu, 14 Jan 2016 19:09:25 +0000 Subject: [PATCH 4/4] disable xenial test, not quite yet juju-deployable with current tools/streams --- tests/021-basic-xenial-mitaka | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tests/021-basic-xenial-mitaka diff --git a/tests/021-basic-xenial-mitaka b/tests/021-basic-xenial-mitaka old mode 100755 new mode 100644