Merge "Update amulet test definitions for Newton"

This commit is contained in:
Jenkins 2016-10-11 01:20:17 +00:00 committed by Gerrit Code Review
commit 4788301b5f
6 changed files with 67 additions and 14 deletions

View File

@ -28,9 +28,10 @@ class TempestBasicDeployment(OpenStackAmuletDeployment):
self._deploy()
u.log.info('Waiting on extended status checks...')
exclude_services = ['mysql', 'mongodb']
exclude_services = []
self._auto_wait_for_status(exclude_services=exclude_services)
self.d.sentry.wait()
self._initialize_tests()
def _add_services(self):
@ -41,11 +42,13 @@ class TempestBasicDeployment(OpenStackAmuletDeployment):
compatible with the local charm (e.g. stable or next).
"""
this_service = {'name': 'tempest'}
other_services = [{'name': 'mysql'},
{'name': 'rabbitmq-server'},
{'name': 'keystone'},
{'name': 'openstack-dashboard'},
{'name': 'glance'}]
other_services = [
{'name': 'percona-cluster', 'constraints': {'mem': '3072M'}},
{'name': 'rabbitmq-server'},
{'name': 'keystone'},
{'name': 'openstack-dashboard'},
{'name': 'glance'}
]
super(TempestBasicDeployment, self)._add_services(
this_service,
other_services,
@ -58,9 +61,9 @@ class TempestBasicDeployment(OpenStackAmuletDeployment):
'tempest:dashboard': 'openstack-dashboard:website',
'openstack-dashboard:identity-service':
'keystone:identity-service',
'keystone:shared-db': 'mysql:shared-db',
'keystone:shared-db': 'percona-cluster:shared-db',
'glance:identity-service': 'keystone:identity-service',
'glance:shared-db': 'mysql:shared-db',
'glance:shared-db': 'percona-cluster:shared-db',
'glance:amqp': 'rabbitmq-server:amqp'
}
super(TempestBasicDeployment, self)._add_relations(relations)
@ -69,7 +72,16 @@ class TempestBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services."""
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
configs = {'keystone': keystone_config}
pxc_config = {
'dataset-size': '25%',
'max-connections': 1000,
'root-password': 'ChangeMe123',
'sst-password': 'ChangeMe123',
}
configs = {
'keystone': keystone_config,
'percona-cluster': pxc_config,
}
super(TempestBasicDeployment, self)._configure_services(configs)
def _get_token(self):
@ -78,9 +90,6 @@ class TempestBasicDeployment(OpenStackAmuletDeployment):
def _initialize_tests(self):
"""Perform final initialization before tests get run."""
# Access the sentries for inspecting service units
self.mysql_sentry = self.d.sentry['mysql'][0]
self.keystone_sentry = self.d.sentry['keystone'][0]
self.rabbitmq_sentry = self.d.sentry['rabbitmq-server'][0]
self.tempest_sentry = self.d.sentry['tempest'][0]
self.openstack_dashboard_sentry = \
self.d.sentry['openstack-dashboard'][0]

View File

@ -0,0 +1,10 @@
#!/usr/bin/env python
"""Amulet tests on a basic tempest deployment on trusty-icehouse."""
from basic_deployment import TempestBasicDeployment
if __name__ == '__main__':
deployment = TempestBasicDeployment(series='trusty')
deployment.run_tests()

View File

@ -0,0 +1,12 @@
#!/usr/bin/env python
"""Amulet tests on a basic tempest deployment on trusty-kilo."""
from basic_deployment import TempestBasicDeployment
if __name__ == '__main__':
# Tempest is installed through pip so cloud archive is not needed here
deployment = TempestBasicDeployment(series='trusty',
openstack='cloud:trusty-kilo',
source='cloud:trusty-updates/kilo')
deployment.run_tests()

View File

@ -0,0 +1,12 @@
#!/usr/bin/env python
"""Amulet tests on a basic tempest deployment on xenial-newton."""
from basic_deployment import TempestBasicDeployment
if __name__ == '__main__':
# Tempest is installed through pip so cloud archive is not needed here
deployment = TempestBasicDeployment(series='xenial',
openstack='cloud:xenial-newton',
source='cloud:xenial-updates/newton')
deployment.run_tests()

View File

@ -0,0 +1,10 @@
#!/usr/bin/env python
"""Amulet tests on a basic tempest deployment on yakkety-newton."""
from basic_deployment import TempestBasicDeployment
if __name__ == '__main__':
deployment = TempestBasicDeployment(series='yakkety')
deployment.run_tests()

View File

@ -1,7 +1,7 @@
# Bootstrap the model if necessary.
bootstrap: True
# Re-use bootstrap node instead of destroying/re-bootstrapping.
reset: True
# No reset https://bugs.launchpad.net/juju/+bug/1541482
reset: False
# Use tox/requirements to drive the venv instead of bundletester's venv feature.
virtualenv: False
# Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.