openstack/charm-cinder
Code Issues Proposed changes

Have icehouse amulet tests use repo with pinned oslo requirements.

Browse Source
This commit is contained in:
Corey Bryant 2015-07-12 20:34:30 +00:00
parent c00ee05da8
commit 7011146ea2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/basic_deployment.py
View File

@ -70,21 +70,16 @@ class CinderBasicDeployment(OpenStackAmuletDeployment):
'glance-api-version': '2', 'glance-api-version': '2',
'overwrite': 'true'} 'overwrite': 'true'}
if self.git: if self.git:
release = self._get_openstack_release_string() branch = 'stable/' + self._get_openstack_release_string()
reqs_branch = 'stable/' + release
if self._get_openstack_release() == self.trusty_icehouse:
cinder_branch = release + '-eol'
else:
cinder_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': reqs_branch}, 'branch': branch},
{'name': 'cinder', {'name': 'cinder',
'repository': 'git://github.com/openstack/cinder', 'repository': 'git://github.com/coreycb/cinder',
'branch': cinder_branch}, 'branch': branch},
], ],
# Most tests use /mnt/openstack-git but cinder's using /dev/vdb # Most tests use /mnt/openstack-git but cinder's using /dev/vdb
# to store block devices so leave /mnt alone. # to store block devices so leave /mnt alone.