diff --git a/osci.yaml b/osci.yaml index 096017a..4f997c1 100644 --- a/osci.yaml +++ b/osci.yaml @@ -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 diff --git a/requirements.txt b/requirements.txt index b786b42..a68620f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/src/metadata.yaml b/src/metadata.yaml index 2756fc3..3971faa 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -15,7 +15,6 @@ description: | tags: - openstack series: -- xenial - bionic - focal - groovy diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 4cc72e5..057fd8d 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -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 diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index f1cdeb0..ac68a9b 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -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 diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index d0164da..32f6df7 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -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 diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 75f1076..b370c08 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -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 diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 88efc6c..3283c80 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -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 diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 8768d3d..14fe2d4 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -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' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index b8d3c74..37d7a78 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -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' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml index b164f4a..cef5159 100644 --- a/src/tests/bundles/focal-wallaby.yaml +++ b/src/tests/bundles/focal-wallaby.yaml @@ -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' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index c2c2ef4..5b947f5 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -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' diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml new file mode 100644 index 0000000..9bc2b27 --- /dev/null +++ b/src/tests/bundles/focal-yoga.yaml @@ -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' diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml index 5c28b1b..4795e2f 100644 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -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' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index f9b6cc0..d20f2aa 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -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' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/jammy-yoga.yaml similarity index 93% rename from src/tests/bundles/groovy-victoria.yaml rename to src/tests/bundles/jammy-yoga.yaml index aee8a8f..7054d44 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -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' diff --git a/src/tests/bundles/xenial-pike.yaml b/src/tests/bundles/xenial-pike.yaml deleted file mode 100644 index c767957..0000000 --- a/src/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -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 diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 7205f97..0000000 --- a/src/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -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 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index bfd4892..bbf75f1 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index af069e1..bb1307f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini index 22159df..faf6092 100644 --- a/tox.ini +++ b/tox.ini @@ -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