openstack
/
charm-keystone-ldap
Code Issues Proposed changes

Add yoga bundles and release-tool syncs 

* charm-helpers sync for classic charms
* sync from release-tools
* switch to release-specific zosci functional tests
* run focal-ussuri as smoke tests
* remove trusty, xenial, and groovy metadata/tests
* drop py35 and add py39

Change-Id: I749b089783627ccbca648c65649cb22e9f471b05
This commit is contained in:
Corey Bryant 2021-10-29 17:00:41 -04:00
parent ea13d2827f
commit 58fa3cf59d
13 changed files with 87 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osci.yaml
View File

@ -1,13 +1,13 @@
- project:
templates:
- charm-unit-jobs
- charm-functional-jobs
check:
jobs:
- focal-xena:
voting: false
- impish-xena:
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
vars:
needs_charm_build: true
charm_build_name: keystone-ldap

1
requirements.txt
View File

@ -9,6 +9,7 @@
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
charm-tools==2.8.3
simplejson

1
src/metadata.yaml
View File

@ -11,7 +11,6 @@ tags:
- ldap
- identity
series:
- xenial
- bionic
- focal
- groovy

62
src/tests/bundles/focal-yoga.yaml Normal file
View File

@ -0,0 +1,62 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
series: bionic
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
# Reduce chances of spurious "super-read-only" failures, see lp:1882205
expel-timeout: 20
to:
- '0'
- '1'
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
series: bionic
to:
- '4'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'

2
src/tests/bundles/groovy-victoria.yaml → src/tests/bundles/jammy-yoga.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: groovy
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'

34
src/tests/bundles/trusty-mitaka.yaml
View File

@ -1,34 +0,0 @@
series: trusty
machines:
'0':
constraints: mem=3072M
'1':
'2':
applications:
percona-cluster:
charm: cs:trusty/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:trusty-mitaka
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
to:
- '2'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

32
src/tests/bundles/xenial-mitaka.yaml
View File

@ -1,32 +0,0 @@
series: xenial
machines:
'0':
constraints: mem=3072M
'1':
'2':
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
to:
- '2'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

34
src/tests/bundles/xenial-ocata.yaml
View File

@ -1,34 +0,0 @@
series: xenial
machines:
'0':
constraints: mem=3072M
'1':
'2':
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-ocata
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
to:
- '2'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

34
src/tests/bundles/xenial-pike.yaml
View File

@ -1,34 +0,0 @@
series: xenial
machines:
'0':
constraints: mem=3072M
'1':
'2':
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-pike
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
to:
- '2'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

34
src/tests/bundles/xenial-queens.yaml
View File

@ -1,34 +0,0 @@
series: xenial
machines:
'0':
constraints: mem=3072M
'1':
'2':
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: cloud:xenial-queens
to:
- '1'
ldap-server:
charm: cs:~openstack-charmers/ldap-test-fixture
num_units: 1
to:
- '2'
keystone-ldap:
charm: ../../../keystone-ldap
relations:
- - 'keystone:domain-backend'
- 'keystone-ldap:domain-backend'
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'

19
src/tests/tests.yaml
View File

@ -4,26 +4,22 @@ smoke_bundles:
- focal-ussuri
gate_bundles:
- xenial-mitaka
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena
dev_bundles:
- trusty-mitaka
- xenial-ocata
- xenial-pike
- xenial-queens
- bionic-rocky
- groovy-victoria
- hirsute-wallaby
- impish-xena
dev_bundles:
- bionic-rocky
- bionic-train
- focal-yoga
- jammy-yoga
target_deploy_status:
keystone-ldap:
workload-status: blocked
@ -35,5 +31,6 @@ tests:
tests_options:
force_deploy:
- groovy-victoria
- hirsute-wallaby
- impish-xena
- jammy-yoga

2
test-requirements.txt
View File

@ -3,6 +3,8 @@
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
stestr>=2.2.0

5
tox.ini
View File

@ -75,6 +75,11 @@ basepython = python3.8
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2