From e178149fd8d158603d9b0ac842df1badc3f480f2 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Wed, 17 Apr 2019 14:00:52 -0700
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: I019337945f3417cc5b9cfc133c15cdab68b647e6
---
.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..b311418 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
host=review.openstack.org
port=29418
project=openstack/charm-ceilometer.git
+
+defaultbranch=stable/19.04
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 20c9f7d..1209637 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/19.04
destination: charmhelpers
include:
- core
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index b205937..2a9e060 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)
--
GitLab