← Back to branch summary

~bac/charms/trusty/openstack-dashboard/apache-slugs

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Corey Bryant
  • Date: 2015-07-09 18:16:49 UTC
  • Revision ID: corey.bryant@canonical.com-20150709181649-nxjfov5i7e00ejv8
[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
59
59
        """Configure all of the services."""
60
60
        horizon_config = {}
61
61
        if self.git:
62
 
            branch = 'stable/' + self._get_openstack_release_string()
 
62
            release = self._get_openstack_release_string()
 
63
            reqs_branch = 'stable/' + release
 
64
            if self._get_openstack_release() == self.trusty_icehouse:
 
65
                horizon_branch = release + '-eol'
 
66
            else:
 
67
                horizon_branch = 'stable/' + release
63
68
            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
64
69
            openstack_origin_git = {
65
70
                'repositories': [
66
71
                    {'name': 'requirements',
67
72
                     'repository': 'git://github.com/openstack/requirements',
68
 
                     'branch': branch},
 
73
                     'branch': reqs_branch},
69
74
                    {'name': 'horizon',
70
75
                     'repository': 'git://github.com/openstack/horizon',
71
 
                     'branch': branch},
 
76
                     'branch': horizon_branch},
72
77
                ],
73
78
                'directory': '/mnt/openstack-git',
74
79
                'http_proxy': amulet_http_proxy,