From 4b397acef9121cec45211796581b8e38423a9f4f Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 19 Nov 2018 14:17:01 -0800 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Switch amulet tests to stable. Switch to using stable charm-helpers branch. Change-Id: I4b5e68b90310ef7206ceda5453c2fd7ecbb29bee --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- tests/basic_deployment.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitreview b/.gitreview index b249296..bdc3b95 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.openstack.org port=29418 project=openstack/charm-ceilometer.git + +defaultbranch=stable/18.11 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index b94d336..4c9c092 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/18.11 destination: hooks/charmhelpers include: - core diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 164d5aa..4c6d4a8 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -35,7 +35,7 @@ class CeilometerBasicDeployment(OpenStackAmuletDeployment): no_origin = ['memcached', 'percona-cluster', 'rabbitmq-server', 'ceph-mon', 'ceph-osd'] - def __init__(self, series, openstack=None, source=None, stable=False): + def __init__(self, series, openstack=None, source=None, stable=True): """Deploy the entire test environment.""" super(CeilometerBasicDeployment, self).__init__(series, openstack, source, stable)