From fe49d910463af15ce910a39408fd0bccf12efd67 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 31 Aug 2022 11:42:29 +0000 Subject: [PATCH] Revert "Add Kinetic and Zed support" This reverts commit c0beec6fa2e5d36985cb1219f75a99c04e3879ae. Reason for revert: I think this should be reverted as it removes focal support from the rabbitmq-server master, and thus this won't cherry-pick cleanly to the stable/jammy channel for the 3.9 track. Change-Id: Iebab77fcc0cee31af66980c2d3be334fffe06222 --- .zuul.yaml | 2 +- bindep.txt | 3 - charmcraft.yaml | 5 +- charmhelpers/contrib/network/ip.py | 2 +- charmhelpers/contrib/openstack/context.py | 79 ++++++++-------- .../templates/section-keystone-authtoken | 3 - .../section-keystone-authtoken-mitaka | 3 - charmhelpers/contrib/openstack/utils.py | 6 +- charmhelpers/contrib/storage/linux/ceph.py | 30 +----- charmhelpers/core/host.py | 35 +------ charmhelpers/core/host_factory/ubuntu.py | 1 - charmhelpers/core/services/base.py | 3 +- charmhelpers/fetch/archiveurl.py | 31 +------ charmhelpers/fetch/ubuntu.py | 10 -- metadata.yaml | 1 + osci.yaml | 4 +- requirements.txt | 11 +-- test-requirements.txt | 16 +++- .../{jammy-zed.yaml => focal-yoga.yaml} | 20 +++- tests/bundles/jammy-yoga.yaml | 2 + tests/bundles/kinetic-zed.yaml | 91 ------------------- tests/tests.yaml | 9 +- tox.ini | 28 +++++- 23 files changed, 126 insertions(+), 269 deletions(-) delete mode 100644 bindep.txt rename tests/bundles/{jammy-zed.yaml => focal-yoga.yaml} (80%) delete mode 100644 tests/bundles/kinetic-zed.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 23bf5f62..7ffc71cb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-zed-jobs + - openstack-python3-charm-yoga-jobs - openstack-cover-jobs diff --git a/bindep.txt b/bindep.txt deleted file mode 100644 index bdbe8d56..00000000 --- a/bindep.txt +++ /dev/null @@ -1,3 +0,0 @@ -libffi-dev [platform:dpkg] -libxml2-dev [platform:dpkg] -libxslt1-dev [platform:dpkg] diff --git a/charmcraft.yaml b/charmcraft.yaml index 09f03428..eb74c308 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -24,10 +24,13 @@ parts: bases: - build-on: - name: ubuntu - channel: "22.04" + channel: "20.04" architectures: - amd64 run-on: + - name: ubuntu + channel: "20.04" + architectures: [amd64, s390x, ppc64el, arm64] - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] diff --git a/charmhelpers/contrib/network/ip.py b/charmhelpers/contrib/network/ip.py index f8edf37a..de56584d 100644 --- a/charmhelpers/contrib/network/ip.py +++ b/charmhelpers/contrib/network/ip.py @@ -467,7 +467,7 @@ def ns_query(address): try: answers = dns.resolver.query(address, rtype) - except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers): + except dns.resolver.NXDOMAIN: return None if answers: diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py index 970a657b..8522641b 100644 --- a/charmhelpers/contrib/openstack/context.py +++ b/charmhelpers/contrib/openstack/context.py @@ -118,7 +118,12 @@ from charmhelpers.contrib.openstack.utils import ( ) from charmhelpers.core.unitdata import kv -from charmhelpers.contrib.hardware import pci +try: + from sriov_netplan_shim import pci +except ImportError: + # The use of the function and contexts that require the pci module is + # optional. + pass try: import psutil @@ -421,9 +426,6 @@ class IdentityServiceContext(OSContextGenerator): ('password', ctxt.get('admin_password', '')), ('signing_dir', ctxt.get('signing_dir', '')),)) - if ctxt.get('service_type'): - c.update((('service_type', ctxt.get('service_type')),)) - return c def __call__(self): @@ -466,9 +468,6 @@ class IdentityServiceContext(OSContextGenerator): 'internal_protocol': int_protocol, 'api_version': api_version}) - if rdata.get('service_type'): - ctxt['service_type'] = rdata.get('service_type') - if float(api_version) > 2: ctxt.update({ 'admin_domain_name': rdata.get('service_domain'), @@ -540,9 +539,6 @@ class IdentityCredentialsContext(IdentityServiceContext): 'api_version': api_version }) - if rdata.get('service_type'): - ctxt['service_type'] = rdata.get('service_type') - if float(api_version) > 2: ctxt.update({'admin_domain_name': rdata.get('domain')}) @@ -2560,18 +2556,14 @@ class OVSDPDKDeviceContext(OSContextGenerator): :rtype: List[int] """ cores = [] - if cpulist and re.match(r"^[0-9,\-^]*$", cpulist): - ranges = cpulist.split(',') - for cpu_range in ranges: - if "-" in cpu_range: - cpu_min_max = cpu_range.split('-') - cores += range(int(cpu_min_max[0]), - int(cpu_min_max[1]) + 1) - elif "^" in cpu_range: - cpu_rm = cpu_range.split('^') - cores.remove(int(cpu_rm[1])) - else: - cores.append(int(cpu_range)) + ranges = cpulist.split(',') + for cpu_range in ranges: + if "-" in cpu_range: + cpu_min_max = cpu_range.split('-') + cores += range(int(cpu_min_max[0]), + int(cpu_min_max[1]) + 1) + else: + cores.append(int(cpu_range)) return cores def _numa_node_cores(self): @@ -2590,32 +2582,36 @@ class OVSDPDKDeviceContext(OSContextGenerator): def cpu_mask(self): """Get hex formatted CPU mask + The mask is based on using the first config:dpdk-socket-cores cores of each NUMA node in the unit. :returns: hex formatted CPU mask :rtype: str """ - num_cores = config('dpdk-socket-cores') - mask = 0 - for cores in self._numa_node_cores().values(): - for core in cores[:num_cores]: - mask = mask | 1 << core - return format(mask, '#04x') + return self.cpu_masks()['dpdk_lcore_mask'] - @classmethod - def pmd_cpu_mask(cls): - """Get hex formatted pmd CPU mask + def cpu_masks(self): + """Get hex formatted CPU masks - The mask is based on config:pmd-cpu-set. - :returns: hex formatted CPU mask - :rtype: str + The mask is based on using the first config:dpdk-socket-cores + cores of each NUMA node in the unit, followed by the + next config:pmd-socket-cores + + :returns: Dict of hex formatted CPU masks + :rtype: Dict[str, str] """ - mask = 0 - cpu_list = cls._parse_cpu_list(config('pmd-cpu-set')) - if cpu_list: - for core in cpu_list: - mask = mask | 1 << core - return format(mask, '#x') + num_lcores = config('dpdk-socket-cores') + pmd_cores = config('pmd-socket-cores') + lcore_mask = 0 + pmd_mask = 0 + for cores in self._numa_node_cores().values(): + for core in cores[:num_lcores]: + lcore_mask = lcore_mask | 1 << core + for core in cores[num_lcores:][:pmd_cores]: + pmd_mask = pmd_mask | 1 << core + return { + 'pmd_cpu_mask': format(pmd_mask, '#04x'), + 'dpdk_lcore_mask': format(lcore_mask, '#04x')} def socket_memory(self): """Formatted list of socket memory configuration per socket. @@ -2694,7 +2690,6 @@ class OVSDPDKDeviceContext(OSContextGenerator): ctxt['device_whitelist'] = self.device_whitelist() ctxt['socket_memory'] = self.socket_memory() ctxt['cpu_mask'] = self.cpu_mask() - ctxt['pmd_cpu_mask'] = self.pmd_cpu_mask() return ctxt @@ -3125,7 +3120,7 @@ class SRIOVContext(OSContextGenerator): """Determine number of Virtual Functions (VFs) configured for device. :param device: Object describing a PCI Network interface card (NIC)/ - :type device: contrib.hardware.pci.PCINetDevice + :type device: sriov_netplan_shim.pci.PCINetDevice :param sriov_numvfs: Number of VFs requested for blanket configuration. :type sriov_numvfs: int :returns: Number of VFs to configure for device diff --git a/charmhelpers/contrib/openstack/templates/section-keystone-authtoken b/charmhelpers/contrib/openstack/templates/section-keystone-authtoken index c9b01528..5dcebe7c 100644 --- a/charmhelpers/contrib/openstack/templates/section-keystone-authtoken +++ b/charmhelpers/contrib/openstack/templates/section-keystone-authtoken @@ -9,7 +9,4 @@ project_name = {{ admin_tenant_name }} username = {{ admin_user }} password = {{ admin_password }} signing_dir = {{ signing_dir }} -{% if service_type -%} -service_type = {{ service_type }} -{% endif -%} {% endif -%} diff --git a/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka b/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka index 14c25b4d..c281868b 100644 --- a/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka +++ b/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka @@ -6,9 +6,6 @@ auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3 auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v3 project_domain_name = {{ admin_domain_name }} user_domain_name = {{ admin_domain_name }} -{% if service_type -%} -service_type = {{ service_type }} -{% endif -%} {% else -%} auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }} auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index 1fa2814a..c8747c16 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/charmhelpers/contrib/openstack/utils.py @@ -158,7 +158,6 @@ OPENSTACK_CODENAMES = OrderedDict([ ('2021.1', 'wallaby'), ('2021.2', 'xena'), ('2022.1', 'yoga'), - ('2022.2', 'zed'), ]) # The ugly duckling - must list releases oldest to newest @@ -401,16 +400,13 @@ def get_os_codename_version(vers): error_out(e) -def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES, - raise_exception=False): +def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES): '''Determine OpenStack version number from codename.''' for k, v in version_map.items(): if v == codename: return k e = 'Could not derive OpenStack version for '\ 'codename: %s' % codename - if raise_exception: - raise ValueError(str(e)) error_out(e) diff --git a/charmhelpers/contrib/storage/linux/ceph.py b/charmhelpers/contrib/storage/linux/ceph.py index 1b20b8fe..244b7af9 100644 --- a/charmhelpers/contrib/storage/linux/ceph.py +++ b/charmhelpers/contrib/storage/linux/ceph.py @@ -614,8 +614,7 @@ class Pool(BasePool): class ReplicatedPool(BasePool): def __init__(self, service, name=None, pg_num=None, replicas=None, - percent_data=None, app_name=None, op=None, - profile_name='replicated_rule'): + percent_data=None, app_name=None, op=None): """Initialize ReplicatedPool object. Pool information is either initialized from individual keyword @@ -632,8 +631,6 @@ class ReplicatedPool(BasePool): to this replicated pool. :type replicas: int :raises: KeyError - :param profile_name: Crush Profile to use - :type profile_name: Optional[str] """ # NOTE: Do not perform initialization steps that require live data from # a running cluster here. The *Pool classes may be used for validation. @@ -648,20 +645,11 @@ class ReplicatedPool(BasePool): # we will fail with KeyError if it is not provided. self.replicas = op['replicas'] self.pg_num = op.get('pg_num') - self.profile_name = op.get('crush-profile') or profile_name else: self.replicas = replicas or 2 self.pg_num = pg_num - self.profile_name = profile_name or 'replicated_rule' def _create(self): - # Validate if crush profile exists - if self.profile_name is None: - msg = ("Failed to discover crush profile named " - "{}".format(self.profile_name)) - log(msg, level=ERROR) - raise PoolCreationError(msg) - # Do extra validation on pg_num with data from live cluster if self.pg_num: # Since the number of placement groups were specified, ensure @@ -679,12 +667,12 @@ class ReplicatedPool(BasePool): '--pg-num-min={}'.format( min(AUTOSCALER_DEFAULT_PGS, self.pg_num) ), - self.name, str(self.pg_num), self.profile_name + self.name, str(self.pg_num) ] else: cmd = [ 'ceph', '--id', self.service, 'osd', 'pool', 'create', - self.name, str(self.pg_num), self.profile_name + self.name, str(self.pg_num) ] check_call(cmd) @@ -703,7 +691,7 @@ class ErasurePool(BasePool): def __init__(self, service, name=None, erasure_code_profile=None, percent_data=None, app_name=None, op=None, allow_ec_overwrites=False): - """Initialize ErasurePool object. + """Initialize ReplicatedPool object. Pool information is either initialized from individual keyword arguments or from a individual CephBrokerRq operation Dict. @@ -789,9 +777,6 @@ def enabled_manager_modules(): :rtype: List[str] """ cmd = ['ceph', 'mgr', 'module', 'ls'] - quincy_or_later = cmp_pkgrevno('ceph-common', '17.1.0') >= 0 - if quincy_or_later: - cmd.append('--format=json') try: modules = check_output(cmd).decode('utf-8') except CalledProcessError as e: @@ -1857,7 +1842,7 @@ class CephBrokerRq(object): } def add_op_create_replicated_pool(self, name, replica_count=3, pg_num=None, - crush_profile=None, **kwargs): + **kwargs): """Adds an operation to create a replicated pool. Refer to docstring for ``_partial_build_common_op_create`` for @@ -1871,10 +1856,6 @@ class CephBrokerRq(object): for pool. :type pg_num: int :raises: AssertionError if provided data is of invalid type/range - :param crush_profile: Name of crush profile to use. If not set the - ceph-mon unit handling the broker request will - set its default value. - :type crush_profile: Optional[str] """ if pg_num and kwargs.get('weight'): raise ValueError('pg_num and weight are mutually exclusive') @@ -1884,7 +1865,6 @@ class CephBrokerRq(object): 'name': name, 'replicas': replica_count, 'pg_num': pg_num, - 'crush-profile': crush_profile } op.update(self._partial_build_common_op_create(**kwargs)) diff --git a/charmhelpers/core/host.py b/charmhelpers/core/host.py index ef6c8eca..2b0a36fb 100644 --- a/charmhelpers/core/host.py +++ b/charmhelpers/core/host.py @@ -114,33 +114,6 @@ def service_stop(service_name, **kwargs): return service('stop', service_name, **kwargs) -def service_enable(service_name, **kwargs): - """Enable a system service. - - The specified service name is managed via the system level init system. - Some init systems (e.g. upstart) require that additional arguments be - provided in order to directly control service instances whereas other init - systems allow for addressing instances of a service directly by name (e.g. - systemd). - - The kwargs allow for the additional parameters to be passed to underlying - init systems for those systems which require/allow for them. For example, - the ceph-osd upstart script requires the id parameter to be passed along - in order to identify which running daemon should be restarted. The follow- - ing example restarts the ceph-osd service for instance id=4: - - service_enable('ceph-osd', id=4) - - :param service_name: the name of the service to enable - :param **kwargs: additional parameters to pass to the init system when - managing services. These will be passed as key=value - parameters to the init system's commandline. kwargs - are ignored for init systems not allowing additional - parameters via the commandline (systemd). - """ - return service('enable', service_name, **kwargs) - - def service_restart(service_name, **kwargs): """Restart a system service. @@ -161,7 +134,7 @@ def service_restart(service_name, **kwargs): :param service_name: the name of the service to restart :param **kwargs: additional parameters to pass to the init system when managing services. These will be passed as key=value - parameters to the init system's commandline. kwargs + parameters to the init system's commandline. kwargs are ignored for init systems not allowing additional parameters via the commandline (systemd). """ @@ -277,7 +250,7 @@ def service_resume(service_name, init_dir="/etc/init", return started -def service(action, service_name=None, **kwargs): +def service(action, service_name, **kwargs): """Control a system service. :param action: the action to take on the service @@ -286,9 +259,7 @@ def service(action, service_name=None, **kwargs): the form of key=value. """ if init_is_systemd(service_name=service_name): - cmd = ['systemctl', action] - if service_name is not None: - cmd.append(service_name) + cmd = ['systemctl', action, service_name] else: cmd = ['service', service_name, action] for key, value in kwargs.items(): diff --git a/charmhelpers/core/host_factory/ubuntu.py b/charmhelpers/core/host_factory/ubuntu.py index cc2d89fe..0906c5c0 100644 --- a/charmhelpers/core/host_factory/ubuntu.py +++ b/charmhelpers/core/host_factory/ubuntu.py @@ -30,7 +30,6 @@ UBUNTU_RELEASES = ( 'hirsute', 'impish', 'jammy', - 'kinetic', ) diff --git a/charmhelpers/core/services/base.py b/charmhelpers/core/services/base.py index 8d217b59..7c37c65c 100644 --- a/charmhelpers/core/services/base.py +++ b/charmhelpers/core/services/base.py @@ -15,8 +15,7 @@ import os import json import inspect -from collections import OrderedDict -from collections.abc import Iterable +from collections import Iterable, OrderedDict from charmhelpers.core import host from charmhelpers.core import hookenv diff --git a/charmhelpers/fetch/archiveurl.py b/charmhelpers/fetch/archiveurl.py index 0e35c901..2cb2e88b 100644 --- a/charmhelpers/fetch/archiveurl.py +++ b/charmhelpers/fetch/archiveurl.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import contextlib import os import hashlib import re @@ -25,15 +24,11 @@ from charmhelpers.payload.archive import ( get_archive_handler, extract, ) -from charmhelpers.core.hookenv import ( - env_proxy_settings, -) from charmhelpers.core.host import mkdir, check_hash from urllib.request import ( build_opener, install_opener, urlopen, urlretrieve, HTTPPasswordMgrWithDefaultRealm, HTTPBasicAuthHandler, - ProxyHandler ) from urllib.parse import urlparse, urlunparse, parse_qs from urllib.error import URLError @@ -55,20 +50,6 @@ def splitpasswd(user): return user, None -@contextlib.contextmanager -def proxy_env(): - """ - Creates a context which temporarily modifies the proxy settings in os.environ. - """ - restore = {**os.environ} # Copy the current os.environ - juju_proxies = env_proxy_settings() or {} - os.environ.update(**juju_proxies) # Insert or Update the os.environ - yield os.environ - for key in juju_proxies: - del os.environ[key] # remove any keys which were added or updated - os.environ.update(**restore) # restore any original values - - class ArchiveUrlFetchHandler(BaseFetchHandler): """ Handler to download archive files from arbitrary URLs. @@ -99,7 +80,6 @@ class ArchiveUrlFetchHandler(BaseFetchHandler): # propagate all exceptions # URLError, OSError, etc proto, netloc, path, params, query, fragment = urlparse(source) - handlers = [] if proto in ('http', 'https'): auth, barehost = splituser(netloc) if auth is not None: @@ -109,13 +89,10 @@ class ArchiveUrlFetchHandler(BaseFetchHandler): # Realm is set to None in add_password to force the username and password # to be used whatever the realm passman.add_password(None, source, username, password) - handlers.append(HTTPBasicAuthHandler(passman)) - - with proxy_env(): - handlers.append(ProxyHandler()) - opener = build_opener(*handlers) - install_opener(opener) - response = urlopen(source) + authhandler = HTTPBasicAuthHandler(passman) + opener = build_opener(authhandler) + install_opener(opener) + response = urlopen(source) try: with open(dest, 'wb') as dest_file: dest_file.write(response.read()) diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py index 93b92765..e6f8a0ad 100644 --- a/charmhelpers/fetch/ubuntu.py +++ b/charmhelpers/fetch/ubuntu.py @@ -222,14 +222,6 @@ CLOUD_ARCHIVE_POCKETS = { 'yoga/proposed': 'focal-proposed/yoga', 'focal-yoga/proposed': 'focal-proposed/yoga', 'focal-proposed/yoga': 'focal-proposed/yoga', - # Zed - 'zed': 'jammy-updates/zed', - 'jammy-zed': 'jammy-updates/zed', - 'jammy-zed/updates': 'jammy-updates/zed', - 'jammy-updates/zed': 'jammy-updates/zed', - 'zed/proposed': 'jammy-proposed/zed', - 'jammy-zed/proposed': 'jammy-proposed/zed', - 'jammy-proposed/zed': 'jammy-proposed/zed', } @@ -256,7 +248,6 @@ OPENSTACK_RELEASES = ( 'wallaby', 'xena', 'yoga', - 'zed', ) @@ -283,7 +274,6 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([ ('hirsute', 'wallaby'), ('impish', 'xena'), ('jammy', 'yoga'), - ('kinetic', 'zed'), ]) diff --git a/metadata.yaml b/metadata.yaml index 7d2ed11d..3897b807 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,6 +10,7 @@ tags: - amqp - misc series: +- focal - jammy provides: amqp: diff --git a/osci.yaml b/osci.yaml index c3c2f434..255c9b3e 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,9 +1,9 @@ - project: templates: + - charm-unit-jobs-py38 - charm-unit-jobs-py310 - - charm-zed-functional-jobs + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: rabbitmq-server build_type: charmcraft - charmcraft_channel: 2.0/stable diff --git a/requirements.txt b/requirements.txt index 3b1cb7b1..ead6e89a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,19 +11,14 @@ pbr==5.6.0 simplejson>=2.2.0 netifaces>=0.10.4 -# NOTE: newer versions of cryptography require a Rust compiler to build, -# see -# * https://github.com/openstack-charmers/zaza/issues/421 -# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html -# -cryptography<3.4 - # Strange import error with newer netaddr: netaddr>0.7.16,<0.8.0 Jinja2>=2.6 # BSD License (3 clause) six>=1.9.0 -dnspython +# dnspython 2.0.0 dropped py3.5 support +dnspython<2.0.0; python_version < '3.6' +dnspython; python_version >= '3.6' psutil>=1.1.1,<2.0.0 diff --git a/test-requirements.txt b/test-requirements.txt index 4ef87dc5..0aabe171 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,7 @@ # 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. +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 requests>=2.18.4 @@ -18,12 +19,25 @@ stestr>=2.2.0 # https://github.com/mtreinish/stestr/issues/145 cliff<3.0.0 +# Dependencies of stestr. Newer versions use keywords that didn't exist in +# python 3.5 yet (e.g. "ModuleNotFoundError") +importlib-metadata<3.0.0; python_version < '3.6' +importlib-resources<3.0.0; python_version < '3.6' + +# Some Zuul nodes sometimes pull newer versions of these dependencies which +# dropped support for python 3.5: +osprofiler<2.7.0;python_version<'3.6' +stevedore<1.31.0;python_version<'3.6' +debtcollector<1.22.0;python_version<'3.6' +oslo.utils<=3.41.0;python_version<'3.6' + 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 # Needed for charm-glance: -git+https://opendev.org/openstack/tempest.git#egg=tempest +git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' +tempest<24.0.0;python_version<'3.6' croniter # needed for charm-rabbitmq-server unit tests diff --git a/tests/bundles/jammy-zed.yaml b/tests/bundles/focal-yoga.yaml similarity index 80% rename from tests/bundles/jammy-zed.yaml rename to tests/bundles/focal-yoga.yaml index 13b5ad29..58851f9e 100644 --- a/tests/bundles/jammy-zed.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -1,7 +1,7 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-zed + openstack-origin: &openstack-origin cloud:focal-yoga -series: jammy +series: focal comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -17,6 +17,8 @@ machines: '5': '6': '7': + '8': + series: bionic # nagios not supported on focal yet applications: @@ -75,6 +77,16 @@ applications: - '7' channel: latest/edge + nagios: + charm: cs:nagios + series: bionic # not supported on focal yet + num_units: 1 + to: + - '8' + + nrpe: + charm: cs:nrpe + relations: - - 'cinder:amqp' @@ -89,3 +101,7 @@ relations: - 'keystone-mysql-router:shared-db' - - 'keystone-mysql-router:db-router' - 'mysql-innodb-cluster:db-router' + - - 'nrpe:nrpe-external-master' + - 'rabbitmq-server:nrpe-external-master' + - - 'nrpe:monitors' + - 'nagios:monitors' diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 32298445..b8885cb7 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -17,6 +17,8 @@ machines: '5': '6': '7': + '8': + series: bionic # nagios not supported on focal+ yet applications: diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index d048497e..00000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,91 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: kinetic - -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': - '6': - '7': - - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ../../rabbitmq-server.charm - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - channel: latest/edge - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/tests/tests.yaml b/tests/tests.yaml index dc832cbd..523e85b2 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,15 +1,13 @@ charm_name: rabbitmq-server smoke_bundles: - - jammy-yoga + - focal-yoga gate_bundles: - - jammy-yoga + - focal-yoga dev_bundles: - jammy-yoga - - jammy-zed - - kinetic-zed tests: - zaza.openstack.charm_tests.rabbitmq_server.tests.RabbitMQDeferredRestartTest @@ -17,4 +15,5 @@ tests: tests_options: force_deploy: - - kinetic-zed + # nrpe charm doesn't support hirsute->jammy and needs to be force installed + - jammy-yoga diff --git a/tox.ini b/tox.ini index bddbd1f2..17751078 100644 --- a/tox.ini +++ b/tox.ini @@ -48,11 +48,26 @@ basepython = python3 deps = -r{toxinidir}/build-requirements.txt commands = charmcraft clean - charmcraft -v pack + charmcraft -v build {toxinidir}/rename.sh -[testenv:py310] -basepython = python3.10 +[testenv:py36] +basepython = python3.6 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + +[testenv:py37] +basepython = python3.7 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + +[testenv:py38] +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 @@ -61,10 +76,15 @@ basepython = python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py310] +basepython = python3.10 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - git+https://github.com/juju/charm-tools.git + charm-tools==2.8.3 commands = flake8 {posargs} hooks unit_tests tests actions lib files charm-proof