openstack
/
charm-glance-simplestreams-sync
Code Issues Proposed changes

Merge "Additional test updates"

This commit is contained in:
Zuul 2021-11-18 14:57:04 +00:00 committed by Gerrit Code Review
parent f2eac23ca2 123697e62f
commit 46221b7519
6 changed files with 13 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metadata.yaml
View File

@ -8,7 +8,6 @@ tags:
- misc
- openstack
series:
- xenial
- bionic
- focal
- groovy

30
osci.yaml
View File

@ -1,24 +1,10 @@
- project:
templates:
- charm-unit-jobs
check:
jobs:
- xenial-mitaka
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- 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
- charm-yoga-unit-jobs
- charm-yoga-functional-jobs
- charm-xena-functional-jobs
- charm-wallaby-functional-jobs
- charm-victoria-functional-jobs
- charm-ussuri-functional-jobs
- charm-stein-functional-jobs
- charm-queens-functional-jobs

97
tests/bundles/xenial-mitaka.yaml
View File

@ -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'

97
tests/bundles/xenial-queens.yaml
View File

@ -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'

2
tests/tests.yaml
View File

@ -17,8 +17,6 @@ gate_bundles:
- impish-xena
dev_bundles:
- xenial-mitaka
- xenial-queens
- bionic-rocky
- bionic-train
- focal-yoga

5
tox.ini
View File

@ -61,6 +61,11 @@ basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt