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

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 72
Proposed branch: lp:~1chb1n/charms/trusty/openstack-dashboard/15.10-stable-flip-tests-helper-syncs
Merge into: lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/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/openstack-dashboard/15.10-stable-flip-tests-helper-syncs
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Review via email: mp+275407@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_unit_test #11455 openstack-dashboard for 1chb1n mp275407
    UNIT OK: passed

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

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

charm_lint_check #12362 openstack-dashboard for 1chb1n mp275407
    LINT OK: passed

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

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:23:34 +0000
+++ charm-helpers-hooks.yaml 2015-10-22 16:29:45 +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:23:34 +0000
+++ charm-helpers-tests.yaml 2015-10-22 16:29:45 +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:23:34 +0000
+++ tests/basic_deployment.py 2015-10-22 16:29:45 +0000
@@ -24,7 +24,7 @@
24 """Amulet tests on a basic openstack-dashboard deployment."""24 """Amulet tests on a basic openstack-dashboard deployment."""
2525
26 def __init__(self, series, openstack=None, source=None, git=False,26 def __init__(self, series, openstack=None, source=None, git=False,
27 stable=False):27 stable=True):
28 """Deploy the entire test environment."""28 """Deploy the entire test environment."""
29 super(OpenstackDashboardBasicDeployment, self).__init__(series,29 super(OpenstackDashboardBasicDeployment, self).__init__(series,
30 openstack,30 openstack,

Subscribers

People subscribed via source and target branches