Merge lp:~1chb1n/charms/trusty/glance/stable-flip-tests-helper-syncs into lp:~openstack-charmers-archive/charms/trusty/glance/trunk

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 121
Proposed branch: lp:~1chb1n/charms/trusty/glance/stable-flip-tests-helper-syncs
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 32 lines (+3/-3)
3 files modified
charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
tests/basic_deployment.py (+1/-1)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/glance/stable-flip-tests-helper-syncs
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Review via email: mp+267562@code.launchpad.net

Description of the change

flip charmhelper sync yamls and amulet tests to use stable branches

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7169 glance for 1chb1n mp267562
    UNIT OK: passed

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

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

charm_lint_check #7756 glance for 1chb1n mp267562
    LINT OK: passed

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

Revision history for this message
Corey Bryant (corey.bryant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-helpers-hooks.yaml'
2--- charm-helpers-hooks.yaml 2015-08-10 16:34:51 +0000
3+++ charm-helpers-hooks.yaml 2015-08-10 17:46:52 +0000
4@@ -1,4 +1,4 @@
5-branch: lp:charm-helpers
6+branch: lp:~openstack-charmers/charm-helpers/stable
7 destination: hooks/charmhelpers
8 include:
9 - core
10
11=== modified file 'charm-helpers-tests.yaml'
12--- charm-helpers-tests.yaml 2015-08-10 16:34:51 +0000
13+++ charm-helpers-tests.yaml 2015-08-10 17:46:52 +0000
14@@ -1,4 +1,4 @@
15-branch: lp:charm-helpers
16+branch: lp:~openstack-charmers/charm-helpers/stable
17 destination: tests/charmhelpers
18 include:
19 - contrib.amulet
20
21=== modified file 'tests/basic_deployment.py'
22--- tests/basic_deployment.py 2015-08-10 16:34:51 +0000
23+++ tests/basic_deployment.py 2015-08-10 17:46:52 +0000
24@@ -29,7 +29,7 @@
25 delete new image."""
26
27 def __init__(self, series=None, openstack=None, source=None, git=False,
28- stable=False):
29+ stable=True):
30 """Deploy the entire test environment."""
31 super(GlanceBasicDeployment, self).__init__(series, openstack,
32 source, stable)

Subscribers

People subscribed via source and target branches