Updates for stable branch creation 21.01
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. Switch to using stable zaza branch. Switch to using stable zaza-openstack-tests branch. Change-Id: I95637d8ebf591c05de7b5ea58db4901f14774283
This commit is contained in:
parent
8c4c1a23d0
commit
e91342875e
|
@ -2,3 +2,5 @@
|
||||||
host=review.opendev.org
|
host=review.opendev.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-barbican.git
|
project=openstack/charm-barbican.git
|
||||||
|
|
||||||
|
defaultbranch=stable/21.01
|
||||||
|
|
|
@ -11,5 +11,5 @@ charm-tools>=2.4.4
|
||||||
keyring<21
|
keyring<21
|
||||||
|
|
||||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack
|
||||||
|
|
|
@ -10,13 +10,13 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky
|
openstack-origin: cloud:bionic-rocky
|
||||||
|
@ -34,7 +34,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
|
@ -10,13 +10,13 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-stein
|
openstack-origin: cloud:bionic-stein
|
||||||
|
@ -34,7 +34,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
|
@ -10,13 +10,13 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-train
|
openstack-origin: cloud:bionic-train
|
||||||
|
@ -34,7 +34,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
|
@ -10,13 +10,13 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '0'
|
- '0'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-ussuri
|
openstack-origin: cloud:bionic-ussuri
|
||||||
|
@ -34,7 +34,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
|
@ -17,12 +17,12 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
barbican-mysql-router:
|
barbican-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -32,7 +32,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -50,7 +50,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
|
|
|
@ -17,12 +17,12 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
barbican-mysql-router:
|
barbican-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -32,7 +32,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -50,7 +50,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
|
|
|
@ -17,12 +17,12 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
barbican-mysql-router:
|
barbican-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -32,7 +32,7 @@ applications:
|
||||||
- '2'
|
- '2'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -50,7 +50,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
to:
|
to:
|
||||||
- '5'
|
- '5'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
psutil
|
psutil
|
||||||
|
|
||||||
git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
|
||||||
|
|
||||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers
|
||||||
|
|
|
@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
|
||||||
#
|
#
|
||||||
# Revisit for removal / mock improvement:
|
# Revisit for removal / mock improvement:
|
||||||
netifaces # vault
|
netifaces # vault
|
||||||
|
|
Loading…
Reference in New Issue