From d1a7d87f58dbeccf9e56d1151995e90f8d11c214 Mon Sep 17 00:00:00 2001 From: David Ames Date: Wed, 17 Apr 2019 14:02:20 -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: I77f0d890e6dd17d40de8131666eb97a29902ea47 --- .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 544af33..91abd45 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.openstack.org port=29418 project=openstack/charm-cinder-backup.git + +defaultbranch=stable/19.04 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index db474fc..6012601 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: hooks/charmhelpers include: - core diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 11c4a02..3ea93ae 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -36,7 +36,7 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment): """Amulet tests on a basic cinder-backup deployment.""" def __init__(self, series=None, openstack=None, source=None, git=False, - stable=False): + stable=True): """Deploy the entire test environment.""" super(CinderBackupBasicDeployment, self).__init__(series, openstack, source, stable)