From 6123b6d590e4b2ada2066d3013090babc9403223 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 13 Aug 2020 11:27:07 +0100 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Switch tests to stable. Switch to using stable charm-helpers branch. Switch to using stable charm.openstack branch. Change-Id: If6c216e54070dda3ec67cb3b96df7a62f3748956 --- .gitreview | 2 ++ src/tests/basic_deployment.py | 2 +- src/wheelhouse.txt | 4 ++++ test-requirements.txt | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitreview b/.gitreview index 86adcc4..011e093 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-barbican-softhsm.git + +defaultbranch=stable/20.08 diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py index 5293ccb..1b05e67 100644 --- a/src/tests/basic_deployment.py +++ b/src/tests/basic_deployment.py @@ -26,7 +26,7 @@ u = OpenStackAmuletUtils(DEBUG) class SoftHSMBasicDeployment(OpenStackAmuletDeployment): """Amulet tests on a basic SoftHSM deployment.""" - def __init__(self, series, openstack=None, source=None, stable=False, + def __init__(self, series, openstack=None, source=None, stable=True, keystone_version='2'): """Deploy the entire test environment. diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index a4d92cc..9b08da1 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1 +1,5 @@ psutil + +git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack + +git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 14b380e..87c3412 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,4 +10,4 @@ charms.reactive mock>=1.2 nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack