From 58ac13b617977b6fad3f4f068ff75fa7c6851e7d Mon Sep 17 00:00:00 2001 From: David Ames Date: Wed, 17 Apr 2019 14:12:55 -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: Iaed0b79e2b0bcab41466794601cee833b27e1e19 --- .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 bbf8b636..43b1843c 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.openstack.org port=29418 project=openstack/charm-neutron-api.git + +defaultbranch=stable/19.04 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 75815133..57b31852 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 effd4ba4..829486b4 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -32,7 +32,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): """Amulet tests on a basic neutron-api deployment.""" def __init__(self, series, openstack=None, source=None, - stable=False): + stable=True): """Deploy the entire test environment.""" super(NeutronAPIBasicDeployment, self).__init__(series, openstack, source, stable)