From ff70a1a528acf1f84a38a7cf32d25e06faf3c13a Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 24 Oct 2019 12:26:59 -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: Ic01496f490b19bfc9c0c23f09d4eda6236583940 --- .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 326df038..12acd415 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-neutron-openvswitch.git + +defaultbranch=stable/19.10 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index da4d3bbc..56ce54ae 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.10 destination: hooks/charmhelpers include: - core diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 0f3ed3a9..1dd2d438 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -40,7 +40,7 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment): """Amulet tests on a basic neutron-openvswitch deployment.""" def __init__(self, series, openstack=None, source=None, - stable=False): + stable=True): """Deploy the entire test environment.""" super(NeutronOVSBasicDeployment, self).__init__(series, openstack, source, stable)