openstack/charm-neutron-gateway
Code Issues Proposed changes

[corey.bryant,trivial] Add icehouse git amulet tests back with new branches.

Browse Source
This commit is contained in:
Corey Bryant 2015-07-09 18:16:49 +00:00
parent 19cf6c5d15
commit e6ede2b745
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/050-basic-trusty-icehouse-git Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/python
"""Amulet tests on a basic quantum-gateway git deployment on trusty-icehouse."""
from basic_deployment import NeutronGatewayBasicDeployment
if __name__ == '__main__':
deployment = NeutronGatewayBasicDeployment(series='trusty', git=True)
deployment.run_tests()

11
tests/basic_deployment.py
View File

@ -68,16 +68,21 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services.""" """Configure all of the services."""
neutron_gateway_config = {} neutron_gateway_config = {}
if self.git: if self.git:
branch = 'stable/' + self._get_openstack_release_string() release = self._get_openstack_release_string()
reqs_branch = 'stable/' + release
if self._get_openstack_release() == self.trusty_icehouse:
neutron_branch = release + '-eol'
else:
neutron_branch = 'stable/' + release
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
openstack_origin_git = { openstack_origin_git = {
'repositories': [ 'repositories': [
{'name': 'requirements', {'name': 'requirements',
'repository': 'git://github.com/openstack/requirements', 'repository': 'git://github.com/openstack/requirements',
'branch': branch}, 'branch': reqs_branch},
{'name': 'neutron', {'name': 'neutron',
'repository': 'git://github.com/openstack/neutron', 'repository': 'git://github.com/openstack/neutron',
'branch': branch}, 'branch': neutron_branch},
], ],
'directory': '/mnt/openstack-git', 'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy, 'http_proxy': amulet_http_proxy,