From c43678953c852e061a2a5f7ed834d234b25ff423 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 8 Mar 2018 17:58:59 +0100 Subject: [PATCH] Updates for stable branch 18.02 creation Set default branch for git review/gerrit. Switch amulet tests to stable. Switch to using stable charm-helpers branch. Change-Id: Id4e9b51c8339c88d2ca994ba87d24ce7ccc313e1 --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- charm-helpers-tests.yaml | 2 +- tests/basic_deployment.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitreview b/.gitreview index 544af33..50277e8 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.openstack.org port=29418 project=openstack/charm-cinder-backup.git + +defaultbranch=stable/18.02 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 699a6e4..f0d365f 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.02 destination: hooks/charmhelpers include: - core diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml index f64f0dd..bb1da45 100644 --- a/charm-helpers-tests.yaml +++ b/charm-helpers-tests.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/18.02 destination: tests/charmhelpers include: - contrib.amulet diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 337bc98..cb59192 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)