openstack
/
charm-keystone
Code Issues Proposed changes

Additional test updates 

* drop xenial metadata and function tests
* switch to release-specific zosci functional tests
* switch to yoga zosci unit test job
* add py39

Change-Id: I6b5b33d17450361f9f11bbc21e0651c2e2d3c0cf
This commit is contained in:
Corey Bryant 2021-11-12 11:07:55 -05:00
parent 18afefd965
commit 5ba7d75df0
9 changed files with 13 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metadata.yaml
View File

@ -10,7 +10,6 @@ tags:
- identity
- misc
series:
- xenial
- bionic
- focal
- groovy

19
osci.yaml
View File

@ -1,13 +1,10 @@
- project:
templates:
- charm-unit-jobs
- charm-functional-jobs
check:
jobs:
- focal-xena
- focal-yoga:
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

45
tests/bundles/trusty-mitaka.yaml
View File

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

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

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

42
tests/bundles/xenial-ocata.yaml
View File

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

42
tests/bundles/xenial-pike.yaml
View File

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

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

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

5
tests/tests.yaml
View File

@ -15,11 +15,6 @@ gate_bundles:
- impish-xena
dev_bundles:
- trusty-mitaka
- xenial-mitaka
- xenial-ocata
- xenial-pike
- 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