Merge lp:~corey.bryant/charms/trusty/glance/amulet-git-fixups into lp:~openstack-charmers-archive/charms/trusty/glance/next

Proposed by Corey Bryant on 2015-07-13
Status: Merged
Merged at revision: 127
Proposed branch: lp:~corey.bryant/charms/trusty/glance/amulet-git-fixups
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 38 lines (+13/-10)
1 file modified
tests/basic_deployment.py (+13/-10)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/glance/amulet-git-fixups
Reviewer Review Type Date Requested Status
OpenStack Charmers 2015-07-13 Pending
Review via email: mp+264554@code.launchpad.net
To post a comment you must log in.
Corey Bryant (corey.bryant) wrote :

Amulet deploy from source updates:
  * Use modified icehouse branches due to requirements issues

charm_lint_check #6114 glance-next for corey.bryant mp264554
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6114/

charm_unit_test #5746 glance-next for corey.bryant mp264554
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5746/

charm_amulet_test #5103 glance-next for corey.bryant mp264554
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5103/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2015-07-09 18:16:48 +0000
3+++ tests/basic_deployment.py 2015-07-13 16:07:48 +0000
4@@ -66,21 +66,24 @@
5 """Configure all of the services."""
6 glance_config = {}
7 if self.git:
8- release = self._get_openstack_release_string()
9- reqs_branch = 'stable/' + release
10+ amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
11+
12+ reqs_repo = 'git://github.com/openstack/requirements'
13+ glance_repo = 'git://github.com/openstack/glance'
14 if self._get_openstack_release() == self.trusty_icehouse:
15- glance_branch = release + '-eol'
16- else:
17- glance_branch = 'stable/' + release
18- amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
19+ reqs_repo = 'git://github.com/coreycb/requirements'
20+ glance_repo = 'git://github.com/coreycb/glance'
21+
22+ branch = 'stable/' + self._get_openstack_release_string()
23+
24 openstack_origin_git = {
25 'repositories': [
26 {'name': 'requirements',
27- 'repository': 'git://github.com/openstack/requirements',
28- 'branch': reqs_branch},
29+ 'repository': reqs_repo,
30+ 'branch': branch},
31 {'name': 'glance',
32- 'repository': 'git://github.com/openstack/glance',
33- 'branch': glance_branch},
34+ 'repository': glance_repo,
35+ 'branch': branch},
36 ],
37 'directory': '/mnt/openstack-git',
38 'http_proxy': amulet_http_proxy,

Subscribers

People subscribed via source and target branches