Merge "Additional test updates"
This commit is contained in:
commit
46221b7519
|
@ -8,7 +8,6 @@ tags:
|
||||||
- misc
|
- misc
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
- focal
|
- focal
|
||||||
- groovy
|
- groovy
|
||||||
|
|
30
osci.yaml
30
osci.yaml
|
@ -1,24 +1,10 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- charm-unit-jobs
|
- charm-yoga-unit-jobs
|
||||||
check:
|
- charm-yoga-functional-jobs
|
||||||
jobs:
|
- charm-xena-functional-jobs
|
||||||
- xenial-mitaka
|
- charm-wallaby-functional-jobs
|
||||||
- bionic-queens
|
- charm-victoria-functional-jobs
|
||||||
- bionic-stein
|
- charm-ussuri-functional-jobs
|
||||||
- bionic-train
|
- charm-stein-functional-jobs
|
||||||
- bionic-ussuri
|
- charm-queens-functional-jobs
|
||||||
- focal-ussuri
|
|
||||||
- focal-victoria
|
|
||||||
- focal-wallaby
|
|
||||||
- focal-xena
|
|
||||||
- focal-yoga:
|
|
||||||
voting: false
|
|
||||||
# hirsuite-wallaby disabled due to:
|
|
||||||
# https://bugs.launchpad.net/charm-ceph-osd/+bug/1929732
|
|
||||||
- hirsute-wallaby:
|
|
||||||
voting: false
|
|
||||||
- impish-xena:
|
|
||||||
voting: false
|
|
||||||
- jammy-yoga:
|
|
||||||
voting: false
|
|
||||||
|
|
|
@ -1,97 +0,0 @@
|
||||||
options:
|
|
||||||
source: &source distro
|
|
||||||
|
|
||||||
series: xenial
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'7':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'8':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- ['vault:shared-db', 'mysql:shared-db']
|
|
||||||
- ['keystone:shared-db', 'mysql:shared-db']
|
|
||||||
- ['glance:shared-db', 'mysql:shared-db']
|
|
||||||
- ['glance:ceph', 'ceph-mon:client']
|
|
||||||
- ['keystone:certificates', 'vault:certificates']
|
|
||||||
- ['glance:certificates', 'vault:certificates']
|
|
||||||
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
|
|
||||||
- ['glance:identity-service', 'keystone:identity-service']
|
|
||||||
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
|
|
||||||
- ['ceph-osd:mon', 'ceph-mon:osd']
|
|
||||||
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
|
|
||||||
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
|
|
||||||
- ['ceph-radosgw:certificates', 'vault:certificates']
|
|
||||||
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers-next/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *source
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *source
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance-simplestreams-sync:
|
|
||||||
charm: ../../glance-simplestreams-sync
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
ceph-radosgw:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-radosgw
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
- '11'
|
|
|
@ -1,97 +0,0 @@
|
||||||
options:
|
|
||||||
source: &source cloud:xenial-queens
|
|
||||||
|
|
||||||
series: xenial
|
|
||||||
|
|
||||||
comment:
|
|
||||||
- 'machines section to decide order of deployment. database sooner = faster'
|
|
||||||
|
|
||||||
machines:
|
|
||||||
'0':
|
|
||||||
'1':
|
|
||||||
'2':
|
|
||||||
'3':
|
|
||||||
'4':
|
|
||||||
'5':
|
|
||||||
'6':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'7':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'8':
|
|
||||||
constraints: "mem=2048"
|
|
||||||
'9':
|
|
||||||
'10':
|
|
||||||
'11':
|
|
||||||
|
|
||||||
relations:
|
|
||||||
- ['vault:shared-db', 'mysql:shared-db']
|
|
||||||
- ['keystone:shared-db', 'mysql:shared-db']
|
|
||||||
- ['glance:shared-db', 'mysql:shared-db']
|
|
||||||
- ['glance:ceph', 'ceph-mon:client']
|
|
||||||
- ['keystone:certificates', 'vault:certificates']
|
|
||||||
- ['glance:certificates', 'vault:certificates']
|
|
||||||
- ['glance-simplestreams-sync:certificates', 'vault:certificates']
|
|
||||||
- ['glance:identity-service', 'keystone:identity-service']
|
|
||||||
- ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
|
|
||||||
- ['ceph-osd:mon', 'ceph-mon:osd']
|
|
||||||
- ['ceph-radosgw:mon', 'ceph-mon:radosgw']
|
|
||||||
- ['ceph-radosgw:identity-service', 'keystone:identity-service']
|
|
||||||
- ['ceph-radosgw:certificates', 'vault:certificates']
|
|
||||||
|
|
||||||
applications:
|
|
||||||
mysql:
|
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '0'
|
|
||||||
vault:
|
|
||||||
charm: cs:~openstack-charmers-next/vault
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '1'
|
|
||||||
keystone:
|
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *source
|
|
||||||
to:
|
|
||||||
- '2'
|
|
||||||
glance:
|
|
||||||
charm: cs:~openstack-charmers-next/glance
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
openstack-origin: *source
|
|
||||||
to:
|
|
||||||
- '3'
|
|
||||||
glance-simplestreams-sync:
|
|
||||||
charm: ../../glance-simplestreams-sync
|
|
||||||
num_units: 1
|
|
||||||
to:
|
|
||||||
- '4'
|
|
||||||
ceph-radosgw:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-radosgw
|
|
||||||
num_units: 1
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '5'
|
|
||||||
ceph-osd:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-osd
|
|
||||||
num_units: 3
|
|
||||||
storage:
|
|
||||||
osd-devices: 'cinder,10G'
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '6'
|
|
||||||
- '7'
|
|
||||||
- '8'
|
|
||||||
ceph-mon:
|
|
||||||
charm: cs:~openstack-charmers-next/ceph-mon
|
|
||||||
num_units: 3
|
|
||||||
options:
|
|
||||||
source: *source
|
|
||||||
to:
|
|
||||||
- '9'
|
|
||||||
- '10'
|
|
||||||
- '11'
|
|
|
@ -17,8 +17,6 @@ gate_bundles:
|
||||||
- impish-xena
|
- impish-xena
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- xenial-mitaka
|
|
||||||
- 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