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

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 45
Proposed branch: lp:~1chb1n/charms/trusty/ceph-radosgw/15.10-stable-flip-tests-helper-syncs
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/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/ceph-radosgw/15.10-stable-flip-tests-helper-syncs
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+275395@code.launchpad.net

Description of the change

Flip next:stable bits for amulet tests and c-h sync yamls.

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

charm_lint_check #12347 ceph-radosgw for 1chb1n mp275395
    LINT OK: passed

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

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

charm_lint_check #12387 ceph-radosgw for 1chb1n mp275395
    LINT OK: passed

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

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

charm_unit_test #11492 ceph-radosgw for 1chb1n mp275395
    UNIT OK: passed

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

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
=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml 2015-10-22 13:18:44 +0000
+++ charm-helpers-hooks.yaml 2015-10-22 16:28:34 +0000
@@ -1,4 +1,4 @@
1branch: lp:charm-helpers1branch: lp:~openstack-charmers/charm-helpers/stable
2destination: hooks/charmhelpers2destination: hooks/charmhelpers
3include:3include:
4 - core4 - core
55
=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml 2015-10-22 13:18:44 +0000
+++ charm-helpers-tests.yaml 2015-10-22 16:28:34 +0000
@@ -1,4 +1,4 @@
1branch: lp:charm-helpers1branch: lp:~openstack-charmers/charm-helpers/stable
2destination: tests/charmhelpers2destination: tests/charmhelpers
3include:3include:
4 - contrib.amulet4 - contrib.amulet
55
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py 2015-10-22 13:18:44 +0000
+++ tests/basic_deployment.py 2015-10-22 16:28:34 +0000
@@ -18,7 +18,7 @@
18class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):18class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
19 """Amulet tests on a basic ceph-radosgw deployment."""19 """Amulet tests on a basic ceph-radosgw deployment."""
2020
21 def __init__(self, series=None, openstack=None, source=None, stable=False):21 def __init__(self, series=None, openstack=None, source=None, stable=True):
22 """Deploy the entire test environment."""22 """Deploy the entire test environment."""
23 super(CephRadosGwBasicDeployment, self).__init__(series, openstack,23 super(CephRadosGwBasicDeployment, self).__init__(series, openstack,
24 source, stable)24 source, stable)

Subscribers

People subscribed via source and target branches