Merge lp:~corey.bryant/charms/trusty/openstack-dashboard/pin-oslos into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 79
Proposed branch: lp:~corey.bryant/charms/trusty/openstack-dashboard/pin-oslos
Merge into: lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Diff against target: 65 lines (+42/-13)
1 file modified
tests/basic_deployment.py (+42/-13)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/openstack-dashboard/pin-oslos
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
OpenStack Charmers Pending
Review via email: mp+266987@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7575 openstack-dashboard-next for corey.bryant mp266987
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7019 openstack-dashboard-next for corey.bryant mp266987
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5640 openstack-dashboard-next for corey.bryant mp266987
    AMULET OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Let's land this.

review: Approve

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-17 17:35:50 +0000
3+++ tests/basic_deployment.py 2015-08-05 01:43:00 +0000
4@@ -69,19 +69,48 @@
5
6 branch = 'stable/' + self._get_openstack_release_string()
7
8- openstack_origin_git = {
9- 'repositories': [
10- {'name': 'requirements',
11- 'repository': reqs_repo,
12- 'branch': branch},
13- {'name': 'horizon',
14- 'repository': horizon_repo,
15- 'branch': branch},
16- ],
17- 'directory': '/mnt/openstack-git',
18- 'http_proxy': amulet_http_proxy,
19- 'https_proxy': amulet_http_proxy,
20- }
21+ if self._get_openstack_release() == self.trusty_juno:
22+ openstack_origin_git = {
23+ 'repositories': [
24+ {'name': 'requirements',
25+ 'repository': reqs_repo,
26+ 'branch': branch},
27+ # NOTE(coreycb): Pin oslo libraries here because they're not
28+ # capped and recently released versions causing issues for juno.
29+ {'name': 'oslo-config',
30+ 'repository': 'git://github.com/openstack/oslo.config',
31+ 'branch': '1.6.0'},
32+ {'name': 'oslo-i18n',
33+ 'repository': 'git://github.com/openstack/oslo.i18n',
34+ 'branch': '1.3.1'},
35+ {'name': 'oslo-serialization',
36+ 'repository': 'git://github.com/openstack/oslo.serialization',
37+ 'branch': '1.2.0'},
38+ {'name': 'oslo-utils',
39+ 'repository': 'git://github.com/openstack/oslo.utils',
40+ 'branch': '1.4.0'},
41+ {'name': 'horizon',
42+ 'repository': horizon_repo,
43+ 'branch': branch},
44+ ],
45+ 'directory': '/mnt/openstack-git',
46+ 'http_proxy': amulet_http_proxy,
47+ 'https_proxy': amulet_http_proxy,
48+ }
49+ else:
50+ openstack_origin_git = {
51+ 'repositories': [
52+ {'name': 'requirements',
53+ 'repository': reqs_repo,
54+ 'branch': branch},
55+ {'name': 'horizon',
56+ 'repository': horizon_repo,
57+ 'branch': branch},
58+ ],
59+ 'directory': '/mnt/openstack-git',
60+ 'http_proxy': amulet_http_proxy,
61+ 'https_proxy': amulet_http_proxy,
62+ }
63 horizon_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
64
65 keystone_config = {'admin-password': 'openstack',

Subscribers

People subscribed via source and target branches