Updates for stable branch creation
Set default branch for git review/gerrit. Switch amulet tests to stable. Switch zaza bundles to stable charms. Switch to using stable charm-helpers branch. Change-Id: I849d2e575e1bf303b4bb580fd32d07b5882c4c8d
This commit is contained in:
parent
d61b2ea230
commit
f9a2f07b94
|
@ -2,3 +2,5 @@
|
||||||
host=review.opendev.org
|
host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-keystone-ldap.git
|
project=openstack/charm-keystone-ldap.git
|
||||||
|
|
||||||
|
defaultbranch=stable/20.02
|
||||||
|
|
|
@ -23,7 +23,7 @@ u = os_amulet_utils.OpenStackAmuletUtils(os_amulet_utils.DEBUG)
|
||||||
class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
||||||
"""Amulet tests on a basic sdn_charm deployment."""
|
"""Amulet tests on a basic sdn_charm deployment."""
|
||||||
|
|
||||||
def __init__(self, series, openstack=None, source=None, stable=False):
|
def __init__(self, series, openstack=None, source=None, stable=True):
|
||||||
"""Deploy the entire test environment."""
|
"""Deploy the entire test environment."""
|
||||||
super(KeystoneLDAPCharmDeployment, self).__init__(series, openstack,
|
super(KeystoneLDAPCharmDeployment, self).__init__(series, openstack,
|
||||||
source, stable)
|
source, stable)
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '1'
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky
|
openstack-origin: cloud:bionic-rocky
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-stein
|
openstack-origin: cloud:bionic-stein
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '1'
|
||||||
|
|
|
@ -13,7 +13,7 @@ applications:
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:trusty-mitaka
|
openstack-origin: cloud:trusty-mitaka
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '1'
|
- '1'
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-ocata
|
openstack-origin: cloud:xenial-ocata
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-pike
|
openstack-origin: cloud:xenial-pike
|
||||||
|
|
|
@ -8,12 +8,12 @@ machines:
|
||||||
|
|
||||||
applications:
|
applications:
|
||||||
percona-cluster:
|
percona-cluster:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:xenial-queens
|
openstack-origin: cloud:xenial-queens
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
|
||||||
|
git+https://opendev.org/openstack/charms.openstack.git@stable/20.02#egg=charms.openstack
|
Loading…
Reference in New Issue