Merge lp:~1chb1n/charms/trusty/rabbitmq-server/stable-flip-tests-helper-syncs into lp:charms/trusty/rabbitmq-server

[Ryan Beisner]

flip charmhelper sync yamls and amulet tests to use stable branches

[lp:~1chb1n/charms/trusty/rabbitmq-server/stable-flip-tests-helper-syncs]

102. By Ryan Beisner on 2015-08-10

flip amulet test stable to True

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #7739 rabbitmq-server for 1chb1n mp267572
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #7191 rabbitmq-server for 1chb1n mp267572
    UNIT OK: passed

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

[Corey Bryant (corey.bryant)]

review: Approve

[Tim Van Steenburgh (tvansteenburgh)]

review: Approve

=== modified file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-08-10 16:38:33 +0000
+++ charm-helpers-tests.yaml	2015-08-10 17:55:43 +0000
@@ -1,5 +1,5 @@
 destination: tests/charmhelpers
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 include:
     - core
     - cli

=== modified file 'charm-helpers.yaml'
--- charm-helpers.yaml	2015-08-10 16:38:33 +0000
+++ charm-helpers.yaml	2015-08-10 17:55:43 +0000
@@ -1,5 +1,5 @@
 destination: hooks/charmhelpers
-branch: lp:charm-helpers
+branch: lp:~openstack-charmers/charm-helpers/stable
 include:
     - fetch
     - core

=== modified file 'tests/20_deploy_relations_test.py'
--- tests/20_deploy_relations_test.py	2015-04-15 07:59:43 +0000
+++ tests/20_deploy_relations_test.py	2015-08-10 17:55:43 +0000
@@ -54,7 +54,7 @@
 # with how the other openstack services are done. For now, we want to test
 # the current branch with the appropriate branches of related charms in
 # order to test /next with /next branches and /trunk with /trunk branches.
-stable = False
+stable = True
 
 
 def determine_charm_branches(services):