openstack/charm-manila-generic
Code Issues Proposed changes

Add yoga bundles and release-tool syncs

Browse Source 
* 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
* add nrpe to bundles

Change-Id: I184e4696336378f8e2b02ff6ce8800c224249e47
Closes-Bug: #1925977
This commit is contained in:
Corey Bryant
2021-10-29 17:00:41 -04:00
parent 8a4270f905
commit 8f961493e3
21 changed files with 170 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osci.yaml
View File

@@ -1,21 +1,13 @@
- project:
templates:
- charm-unit-jobs
check:
jobs:
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- focal-xena:
voting: false
- groovy-victoria
- hirsute-wallaby
- 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: manila-generic

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

@@ -15,7 +15,6 @@ description: |
tags:
- openstack
series:
- xenial
- bionic
- focal
- groovy

4
src/tests/bundles/bionic-queens.yaml
View File

@@ -18,6 +18,8 @@ services:
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
@@ -30,3 +32,5 @@ relations:
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

4
src/tests/bundles/bionic-rocky.yaml
View File

@@ -27,6 +27,8 @@ services:
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
@@ -39,3 +41,5 @@ relations:
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

4
src/tests/bundles/bionic-stein.yaml
View File

@@ -27,6 +27,8 @@ services:
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
@@ -39,3 +41,5 @@ relations:
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

4
src/tests/bundles/bionic-train.yaml
View File

@@ -27,6 +27,8 @@ services:
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
@@ -39,3 +41,5 @@ relations:
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

4
src/tests/bundles/bionic-ussuri.yaml
View File

@@ -27,6 +27,8 @@ services:
num_units: 1
options:
openstack-origin: *source
nrpe:
charm: cs:nrpe
relations:
- - manila:manila-plugin
@@ -39,3 +41,5 @@ relations:
- percona-cluster
- - manila
- percona-cluster
- - nrpe:nrpe-external-master
- manila:nrpe-external-master

5
src/tests/bundles/focal-ussuri.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

5
src/tests/bundles/focal-victoria.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

5
src/tests/bundles/focal-wallaby.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

5
src/tests/bundles/focal-xena.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

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

@@ -0,0 +1,90 @@
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':
'5':
services:
manila-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
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
to:
- '0'
- '1'
- '2'
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

5
src/tests/bundles/hirsute-wallaby.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

5
src/tests/bundles/impish-xena.yaml
View File

@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

7
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'
@@ -62,6 +62,8 @@ services:
openstack-origin: *openstack-origin
to:
- '5'
nrpe:
charm: cs:nrpe
relations:
@@ -83,3 +85,6 @@ relations:
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

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

@@ -1,41 +0,0 @@
series: xenial
options:
source: &source cloud:xenial-pike
services:
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

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

@@ -1,41 +0,0 @@
series: xenial
options:
source: &source cloud:xenial-queens
services:
manila:
charm: cs:~openstack-charmers-next/manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *source
manila-generic:
charm: ../../../manila-generic
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *source
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
options:
source: *source
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *source
relations:
- - manila:manila-plugin
- manila-generic
- - manila
- rabbitmq-server
- - manila
- keystone
- - keystone
- percona-cluster
- - manila
- percona-cluster

16
src/tests/tests.yaml
View File

@@ -3,23 +3,22 @@ charm_name: manila-generic
gate_bundles:
- bionic-queens
- bionic-stein
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
- focal-wallaby
- groovy-victoria
- focal-xena
- hirsute-wallaby
- impish-xena
smoke_bundles:
- focal-ussuri
dev_bundles:
- xenial-pike
- xenial-queens
- bionic-rocky
- focal-xena
- hirsute-wallaby
- impish-wallaby
- bionic-train
- focal-yoga
- jammy-yoga
target_deploy_status: {}
@@ -31,5 +30,6 @@ configure:
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