← Back to branch summary

~1chb1n/charms/trusty/cinder/next1507-amulet-cleanup

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Corey Bryant
  • Date: 2015-07-09 18:16:48 UTC
  • Revision ID: corey.bryant@canonical.com-20150709181648-qmd8qkktsydw724j
[corey.bryant,trivial] Add icehouse git amulet tests back with new branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
70
70
                         'glance-api-version': '2',
71
71
                         'overwrite': 'true'}
72
72
        if self.git:
73
 
            branch = 'stable/' + self._get_openstack_release_string()
 
73
            release = self._get_openstack_release_string()
 
74
            reqs_branch = 'stable/' + release
 
75
            if self._get_openstack_release() == self.trusty_icehouse:
 
76
                cinder_branch = release + '-eol'
 
77
            else:
 
78
                cinder_branch = 'stable/' + release
74
79
            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
75
80
            openstack_origin_git = {
76
81
                'repositories': [
77
82
                    {'name': 'requirements',
78
83
                     'repository': 'git://github.com/openstack/requirements',
79
 
                     'branch': branch},
 
84
                     'branch': reqs_branch},
80
85
                    {'name': 'cinder',
81
86
                     'repository': 'git://github.com/openstack/cinder',
82
 
                     'branch': branch},
 
87
                     'branch': cinder_branch},
83
88
                ],
84
89
                'directory': '/mnt/openstack-git',
85
90
                'http_proxy': amulet_http_proxy,