Merge "Additional test updates"
This commit is contained in:
commit
cc54bc260e
|
@ -10,7 +10,6 @@ tags:
|
||||||
- identity
|
- identity
|
||||||
- misc
|
- misc
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
- groovy
|
||||||
|
|
19
osci.yaml
19
osci.yaml
|
@ -1,13 +1,10 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-yoga-unit-jobs
|
||||||
- charm-functional-jobs
|
- charm-yoga-functional-jobs
|
||||||
check:
|
- charm-xena-functional-jobs
|
||||||
jobs:
|
- charm-wallaby-functional-jobs
|
||||||
- focal-xena
|
- charm-victoria-functional-jobs
|
||||||
- focal-yoga:
|
- charm-ussuri-functional-jobs
|
||||||
voting: false
|
- charm-stein-functional-jobs
|
||||||
- impish-xena:
|
- charm-queens-functional-jobs
|
||||||
voting: false
|
|
||||||
- jammy-yoga:
|
|
||||||
voting: false
|
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
series: trusty
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: virt-type=kvm mem=3072M
|
|
||||||
'1':
|
|
||||||
constraints: virt-type=kvm
|
|
||||||
'2':
|
|
||||||
constraints: virt-type=kvm
|
|
||||||
'3':
|
|
||||||
constraints: virt-type=kvm
|
|
||||||
'4':
|
|
||||||
constraints: virt-type=kvm
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:trusty/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
keystone:
|
|
||||||
series: trusty
|
|
||||||
charm: ../../../keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:trusty-mitaka
|
|
||||||
to:
|
|
||||||
- '4'
|
|
|
@ -1,36 +0,0 @@
|
||||||
series: xenial
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
keystone:
|
|
||||||
series: xenial
|
|
||||||
charm: ../../../keystone
|
|
||||||
num_units: 3
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
|
@ -1,42 +0,0 @@
|
||||||
series: xenial
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
keystone:
|
|
||||||
series: xenial
|
|
||||||
charm: ../../../keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
token-provider: 'fernet'
|
|
||||||
token-expiration: 300
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-ocata
|
|
||||||
to:
|
|
||||||
- '4'
|
|
|
@ -1,42 +0,0 @@
|
||||||
series: xenial
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
keystone:
|
|
||||||
series: xenial
|
|
||||||
charm: ../../../keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
token-provider: 'fernet'
|
|
||||||
token-expiration: 300
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-pike
|
|
||||||
to:
|
|
||||||
- '4'
|
|
|
@ -1,42 +0,0 @@
|
||||||
series: xenial
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
constraints: mem=3072M
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
relations:
|
|
||||||
- - keystone:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:shared-db
|
|
||||||
- mysql:shared-db
|
|
||||||
- - glance:identity-service
|
|
||||||
- keystone:identity-service
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
keystone:
|
|
||||||
series: xenial
|
|
||||||
charm: ../../../keystone
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
token-provider: 'fernet'
|
|
||||||
token-expiration: 300
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
- '2'
|
|
||||||
- '3'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: cloud:xenial-queens
|
|
||||||
to:
|
|
||||||
- '4'
|
|
|
@ -15,11 +15,6 @@ gate_bundles:
|
||||||
- impish-xena
|
- impish-xena
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- trusty-mitaka
|
|
||||||
- xenial-mitaka
|
|
||||||
- xenial-ocata
|
|
||||||
- xenial-pike
|
|
||||||
- xenial-queens
|
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- focal-yoga
|
- focal-yoga
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -61,6 +61,11 @@ basepython = python3.8
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
|
[testenv:py39]
|
||||||
|
basepython = python3.9
|
||||||
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py3]
|
[testenv:py3]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
|
Loading…
Reference in New Issue