Browse Source

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: I846aa36c57104f2dd754b73ce730517d74d66141
changes/17/730017/2
David Ames 2 years ago
parent
commit
357c56786d
  1. 2
      .gitreview
  2. 6
      src/tests/bundles/bionic-rocky.yaml
  3. 6
      src/tests/bundles/bionic-stein.yaml
  4. 6
      src/tests/bundles/bionic-train.yaml
  5. 6
      src/tests/bundles/bionic-ussuri.yaml
  6. 10
      src/tests/bundles/focal-ussuri.yaml
  7. 4
      src/wheelhouse.txt

2
.gitreview

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-barbican.git
defaultbranch=stable/20.05

6
src/tests/bundles/bionic-rocky.yaml

@ -10,13 +10,13 @@ machines:
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
@ -34,7 +34,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'

6
src/tests/bundles/bionic-stein.yaml

@ -10,13 +10,13 @@ machines:
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-stein
@ -34,7 +34,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'

6
src/tests/bundles/bionic-train.yaml

@ -10,13 +10,13 @@ machines:
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-train
@ -34,7 +34,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'

6
src/tests/bundles/bionic-ussuri.yaml

@ -10,13 +10,13 @@ machines:
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: cloud:bionic-ussuri
@ -34,7 +34,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '3'

10
src/tests/bundles/focal-ussuri.yaml

@ -17,12 +17,12 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
barbican-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -32,7 +32,7 @@ applications:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -50,7 +50,7 @@ applications:
- '4'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '5'

4
src/wheelhouse.txt

@ -1,3 +1,7 @@
jinja2
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/20.05#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git@stable/20.05#egg=charmhelpers

Loading…
Cancel
Save