From 034e97093e0a7b0d5d347bccc05bb56fb887d76a Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 14 Feb 2023 21:26:00 +0000 Subject: [PATCH] Add Antelope support * sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: I698b89d2c4dfff7b667a810a42adda665773a5ce --- .zuul.yaml | 2 +- charmcraft.yaml | 3 + metadata.yaml | 1 + osci.yaml | 2 +- test-requirements.txt | 39 ++++++---- tests/bundles/jammy-antelope.yaml | 76 +++++++++++++++++++ .../{jammy-yoga.yaml => lunar-antelope.yaml} | 2 +- tests/tests.yaml | 8 +- tox.ini | 2 +- 9 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 tests/bundles/jammy-antelope.yaml rename tests/bundles/{jammy-yoga.yaml => lunar-antelope.yaml} (99%) diff --git a/.zuul.yaml b/.zuul.yaml index 23bf5f6..fd20909 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-zed-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index 192062a..12551d5 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -32,3 +32,6 @@ bases: - name: ubuntu channel: "22.10" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "23.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index ac6d103..5ae8868 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -12,6 +12,7 @@ tags: series: - jammy - kinetic + - lunar subordinate: true provides: storage-backend: diff --git a/osci.yaml b/osci.yaml index 7c975f2..e340081 100644 --- a/osci.yaml +++ b/osci.yaml @@ -2,7 +2,7 @@ templates: - charm-unit-jobs-py310 # Does not have working functional tests. Virtual appliance doesn't exist yet. - # - charm-zed-functional-jobs + # - charm-functional-jobs vars: needs_charm_build: true charm_build_name: cinder-solidfire diff --git a/test-requirements.txt b/test-requirements.txt index 1ab98d6..478134e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,18 +1,31 @@ -# This file is managed centrally. If you find the need to modify this as a -# one-off, please don't. Intead, consult #openstack-charms and ask about -# requirements management in charms via bot-control. Thank you. -charm-tools>=2.4.4 -coverage>=3.6 -mock>=1.2 -flake8>=4.0.1 -stestr>=2.2.0 +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of *requirements.txt files for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools +# +# TODO: Distill the func test requirements from the lint/unit test +# requirements. They are intertwined. Also, Zaza itself should specify +# all of its own requirements and if it doesn't, fix it there. +# +pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. + requests>=2.18.4 -psutil -# oslo.i18n dropped py35 support -oslo.i18n<4.0.0 + +stestr>=2.2.0 + +# Dependency of stestr. Workaround for +# https://github.com/mtreinish/stestr/issues/145 +cliff<3.0.0 + +coverage>=4.5.2 +pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack -pytz # workaround for 14.04 pip/tox -pyudev # for ceph-* charm unit tests (not mocked?) + +# Needed for charm-glance: +git+https://opendev.org/openstack/tempest.git#egg=tempest + +croniter # needed for charm-rabbitmq-server unit tests +psutil ops git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml new file mode 100644 index 0000000..4a7e22f --- /dev/null +++ b/tests/bundles/jammy-antelope.yaml @@ -0,0 +1,76 @@ +series: jammy +variables: + openstack-origin: &openstack-origin cloud:jammy-antelope +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': + constraints: mem=4G root-disk=16G + +applications: + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + channel: latest/edge + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + rabbitmq-server: + charm: ch:rabbitmq-server + channel: latest/edge + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + keystone: + charm: ch:keystone + channel: latest/edge + options: + openstack-origin: *openstack-origin + num_units: 1 + to: + - '4' + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + cinder: + charm: ch:cinder + channel: latest/edge + num_units: 1 + storage: + block-devices: '40G' + options: + openstack-origin: *openstack-origin + block-device: None + overwrite: "true" + to: + - '5' + + cinder-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + cinder-solidfire: + charm: ../../cinder-solidfire.charm + +relations: + - [ keystone:shared-db, keystone-mysql-router:shared-db ] + - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ] + - [ cinder:shared-db, cinder-mysql-router:shared-db ] + - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ] + - [ cinder:identity-service, keystone:identity-service ] + - [ cinder:amqp, rabbitmq-server:amqp ] + - [ cinder:storage-backend, cinder-solidfire:storage-backend ] diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/lunar-antelope.yaml similarity index 99% rename from tests/bundles/jammy-yoga.yaml rename to tests/bundles/lunar-antelope.yaml index 87fdc1f..9529639 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/lunar-antelope.yaml @@ -1,4 +1,4 @@ -series: jammy +series: lunar variables: openstack-origin: &openstack-origin distro comment: diff --git a/tests/tests.yaml b/tests/tests.yaml index 6d80edd..657f15a 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,10 +4,10 @@ tests: configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user gate_bundles: - - jammy-yoga -dev_bundles: - - jammy-yoga - jammy-zed +dev_bundles: + - jammy-antelope - kinetic-zed + - lunar-antelope smoke_bundles: - - jammy-yoga + - jammy-zed diff --git a/tox.ini b/tox.ini index 854d8be..c11375e 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ allowlist_externals = charmcraft bash tox - rename.sh + {toxinidir}/rename.sh deps = -r{toxinidir}/requirements.txt