diff --git a/tests/050-basic-trusty-icehouse-git b/tests/050-basic-trusty-icehouse-git new file mode 100755 index 00000000..562a8486 --- /dev/null +++ b/tests/050-basic-trusty-icehouse-git @@ -0,0 +1,9 @@ +#!/usr/bin/python + +"""Amulet tests on a basic Glance git deployment on trusty-icehouse.""" + +from basic_deployment import GlanceBasicDeployment + +if __name__ == '__main__': + deployment = GlanceBasicDeployment(series='trusty', git=True) + deployment.run_tests() diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 0bd8df25..a2f6e789 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -66,16 +66,21 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment): """Configure all of the services.""" glance_config = {} 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: + glance_branch = release + '-eol' + else: + glance_branch = 'stable/' + release amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') openstack_origin_git = { 'repositories': [ {'name': 'requirements', 'repository': 'git://github.com/openstack/requirements', - 'branch': branch}, + 'branch': reqs_branch}, {'name': 'glance', 'repository': 'git://github.com/openstack/glance', - 'branch': branch}, + 'branch': glance_branch}, ], 'directory': '/mnt/openstack-git', 'http_proxy': amulet_http_proxy,