From 69e183990a843f35f2cf0cbe0d01e215f18d5bdb Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 29 Oct 2021 17:00:38 -0400 Subject: [PATCH] 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: If4892692cda73dacc3b9b430cdaf9c82f814b64a --- charmhelpers/contrib/openstack/utils.py | 23 +- charmhelpers/contrib/storage/linux/ceph.py | 11 +- charmhelpers/core/host_factory/ubuntu.py | 1 + charmhelpers/fetch/ubuntu.py | 1 + metadata.yaml | 1 - osci.yaml | 33 +- test-requirements.txt | 2 + tests/bundles/focal-yoga.yaml | 305 ++++++++++++++++++ tests/bundles/impish-xena.yaml | 2 +- .../{groovy-victoria.yaml => jammy-yoga.yaml} | 6 +- tests/bundles/trusty-mitaka.yaml | 106 ------ tests/bundles/xenial-mitaka.yaml | 93 ------ tests/bundles/xenial-ocata.yaml | 203 ------------ tests/bundles/xenial-pike.yaml | 198 ------------ tests/bundles/xenial-queens.yaml | 198 ------------ tests/tests.yaml | 16 +- tox.ini | 5 + 17 files changed, 358 insertions(+), 846 deletions(-) create mode 100644 tests/bundles/focal-yoga.yaml rename tests/bundles/{groovy-victoria.yaml => jammy-yoga.yaml} (96%) delete mode 100644 tests/bundles/trusty-mitaka.yaml delete mode 100644 tests/bundles/xenial-mitaka.yaml delete mode 100644 tests/bundles/xenial-ocata.yaml delete mode 100644 tests/bundles/xenial-pike.yaml delete mode 100644 tests/bundles/xenial-queens.yaml diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index d5d301e..9cc96d6 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/charmhelpers/contrib/openstack/utils.py @@ -1413,7 +1413,8 @@ def incomplete_relation_data(configs, required_interfaces): for i in incomplete_relations} -def do_action_openstack_upgrade(package, upgrade_callback, configs): +def do_action_openstack_upgrade(package, upgrade_callback, configs, + force_upgrade=False): """Perform action-managed OpenStack upgrade. Upgrades packages to the configured openstack-origin version and sets @@ -1427,12 +1428,13 @@ def do_action_openstack_upgrade(package, upgrade_callback, configs): @param package: package name for determining if upgrade available @param upgrade_callback: function callback to charm's upgrade function @param configs: templating object derived from OSConfigRenderer class + @param force_upgrade: perform dist-upgrade regardless of new openstack @return: True if upgrade successful; False if upgrade failed or skipped """ ret = False - if openstack_upgrade_available(package): + if openstack_upgrade_available(package) or force_upgrade: if config('action-managed-upgrade'): juju_log('Upgrading OpenStack release') @@ -2599,6 +2601,23 @@ def get_subordinate_release_packages(os_release, package_type='deb'): return SubordinatePackages(install, purge) +def get_subordinate_services(): + """Iterate over subordinate relations and get service information. + + In a similar fashion as with get_subordinate_release_packages(), + principle charms can retrieve a list of services advertised by their + subordinate charms. This is useful to know about subordinate services when + pausing, resuming or upgrading a principle unit. + + :returns: Name of all services advertised by all subordinates + :rtype: Set[str] + """ + services = set() + for rdata in container_scoped_relation_get('services'): + services |= set(json.loads(rdata or '[]')) + return services + + os_restart_on_change = partial( pausable_restart_on_change, can_restart_now_f=deferred_events.check_and_record_restart_request, diff --git a/charmhelpers/contrib/storage/linux/ceph.py b/charmhelpers/contrib/storage/linux/ceph.py index 3eb46d7..c70aeb2 100644 --- a/charmhelpers/contrib/storage/linux/ceph.py +++ b/charmhelpers/contrib/storage/linux/ceph.py @@ -294,7 +294,6 @@ class BasePool(object): # NOTE: Do not perform initialization steps that require live data from # a running cluster here. The *Pool classes may be used for validation. self.service = service - self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0 self.op = op or {} if op: @@ -341,7 +340,8 @@ class BasePool(object): Do not add calls for a specific pool type here, those should go into one of the pool specific classes. """ - if self.nautilus_or_later: + nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0 + if nautilus_or_later: # Ensure we set the expected pool ratio update_pool( client=self.service, @@ -660,8 +660,9 @@ class ReplicatedPool(BasePool): else: self.pg_num = self.get_pgs(self.replicas, self.percent_data) + nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0 # Create it - if self.nautilus_or_later: + if nautilus_or_later: cmd = [ 'ceph', '--id', self.service, 'osd', 'pool', 'create', '--pg-num-min={}'.format( @@ -745,9 +746,9 @@ class ErasurePool(BasePool): k = int(erasure_profile['k']) m = int(erasure_profile['m']) pgs = self.get_pgs(k + m, self.percent_data) - self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0 + nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0 # Create it - if self.nautilus_or_later: + if nautilus_or_later: cmd = [ 'ceph', '--id', self.service, 'osd', 'pool', 'create', '--pg-num-min={}'.format( diff --git a/charmhelpers/core/host_factory/ubuntu.py b/charmhelpers/core/host_factory/ubuntu.py index e710c0e..0906c5c 100644 --- a/charmhelpers/core/host_factory/ubuntu.py +++ b/charmhelpers/core/host_factory/ubuntu.py @@ -29,6 +29,7 @@ UBUNTU_RELEASES = ( 'groovy', 'hirsute', 'impish', + 'jammy', ) diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py index 6c7cf6f..cf8328f 100644 --- a/charmhelpers/fetch/ubuntu.py +++ b/charmhelpers/fetch/ubuntu.py @@ -275,6 +275,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([ ('groovy', 'victoria'), ('hirsute', 'wallaby'), ('impish', 'xena'), + ('jammy', 'yoga'), ]) diff --git a/metadata.yaml b/metadata.yaml index c88091c..2a79f14 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,7 +17,6 @@ tags: - telemetry - misc series: -- xenial - bionic - focal - groovy diff --git a/osci.yaml b/osci.yaml index 4d7b979..0b2a0aa 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,27 +1,10 @@ - project: templates: - - charm-unit-jobs - check: - jobs: - - xenial-mitaka_ceilometer-agent - - 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 - -- job: - name: xenial-mitaka_ceilometer-agent - parent: func-target - dependencies: - - bionic-ussuri - vars: - tox_extra_args: mitaka:xenial-mitaka + - 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 diff --git a/test-requirements.txt b/test-requirements.txt index dba2c76..f853625 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,8 @@ # 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. +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 diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml new file mode 100644 index 0000000..540eea7 --- /dev/null +++ b/tests/bundles/focal-yoga.yaml @@ -0,0 +1,305 @@ +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': + # machine for memcached; doesn't have a focal+ version yet. + series: bionic + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + constraints: mem=4096M + '14': + constraints: mem=4096M cores=4 + '15': + '16': + '17': + '18': + '19': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + gnocchi-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-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' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # hold at bionic as no focal version of the charm yet + series: bionic + to: + - '4' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + options: + source: *openstack-origin + storage: + osd-devices: 'cinder,10G' + to: + - '5' + - '6' + - '7' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + to: + - '8' + - '9' + - '10' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '11' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + to: + - '13' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '14' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '15' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '16' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + + ceilometer: + charm: cs:~openstack-charmers-next/ceilometer + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + polling-interval: 10 + polling-batch-size: 0 + to: + - '17' + + gnocchi: + charm: cs:~openstack-charmers-next/gnocchi + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '18' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + to: + - '19' + + ceilometer-agent: + options: + polling-interval: 10 + # NOTE(lourot): we normally set this to `true` in other bundles in order + # to validate more metrics but this is broken on Wallaby. See lp:1938884 + enable-all-pollsters: false + +relations: + + - - 'ceilometer:amqp' + - 'rabbitmq-server:amqp' + + - - 'ceilometer:identity-notifications' + - 'keystone:identity-notifications' + + - - 'ceilometer:ceilometer-service' + - 'ceilometer-agent:ceilometer-service' + + - - 'ceilometer:metric-service' + - 'gnocchi:metric-service' + + - - 'ceilometer:identity-credentials' + - 'keystone:identity-credentials' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'ceilometer-agent:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-compute:nova-ceilometer' + - 'ceilometer-agent:nova-ceilometer' + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement:identity-service' + - 'keystone:identity-service' + + - - 'placement:placement' + - 'nova-cloud-controller:placement' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:identity-service' + - 'keystone:identity-service' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'ceph-mon:osd' + - 'ceph-osd:mon' + + - - 'gnocchi:shared-db' + - 'gnocchi-mysql-router:shared-db' + - - 'gnocchi-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'gnocchi:storage-ceph' + - 'ceph-mon:client' + + - - 'gnocchi:coordinator-memcached' + - 'memcached:cache' + + - - 'gnocchi:identity-service' + - 'keystone:identity-service' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:neutron-api' + - 'nova-cloud-controller:neutron-api' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'rabbitmq-server:amqp' + - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 31d0236..52681e3 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: impist +series: impish comment: - 'machines section to decide order of deployment. database sooner = faster' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/jammy-yoga.yaml similarity index 96% rename from tests/bundles/groovy-victoria.yaml rename to tests/bundles/jammy-yoga.yaml index 5358482..58001b0 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/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' @@ -184,7 +184,9 @@ applications: ceilometer-agent: options: polling-interval: 10 - enable-all-pollsters: true + # NOTE(lourot): we normally set this to `true` in other bundles in order + # to validate more metrics but this is broken on Wallaby. See lp:1938884 + enable-all-pollsters: false relations: diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml deleted file mode 100644 index fc9aef1..0000000 --- a/tests/bundles/trusty-mitaka.yaml +++ /dev/null @@ -1,106 +0,0 @@ -options: - source: &source cloud:trusty-mitaka - -series: trusty - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: - constraints: mem=4096M - 6: {} - 7: {} - -applications: - percona-cluster: - charm: cs:trusty/percona-cluster - num_units: 1 - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - mongodb: - charm: cs:trusty/mongodb-53 - num_units: 1 - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '3' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '4' - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - to: - - '5' - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '6' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *source - to: - - '7' - ceilometer-agent: {} - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index 4c40a16..0000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,93 +0,0 @@ -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: - constraints: mem=4096M - 6: {} - 7: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - mongodb: - charm: cs:xenial/mongodb - num_units: 1 - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - to: - - '3' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - to: - - '4' - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - to: - - '5' - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '6' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - to: - - '7' - ceilometer-agent: {} - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index 6929eff..0000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,203 +0,0 @@ -options: - source: &source cloud:xenial-ocata -series: xenial -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - 17: {} -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - mongodb: - num_units: 1 - charm: cs:xenial/mongodb - to: - - '17' - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index bfde3ff..0000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:xenial-pike - -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index d9271b8..0000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:xenial-queens - -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/tests.yaml b/tests/tests.yaml index fc8ae16..2e4d577 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,8 +1,6 @@ charm_name: ceilometer-agent configure: - - mitaka: - - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.keystone.setup.add_demo_user @@ -11,31 +9,25 @@ configure: - zaza.openstack.charm_tests.nova.setup.manage_ssh_key gate_bundles: - - mitaka: xenial-mitaka - bionic-queens - - bionic-train - bionic-ussuri - focal-ussuri - focal-victoria - focal-wallaby - focal-xena - - groovy-victoria - hirsute-wallaby - impish-xena dev_bundles: - - mitaka: trusty-mitaka - - xenial-ocata - - xenial-pike - - xenial-queens - bionic-rocky + - bionic-train + - focal-yoga + - jammy-yoga smoke_bundles: - focal-ussuri tests: - - mitaka: - - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest - zaza.openstack.charm_tests.ceilometer_agent.tests.CeilometerAgentTest @@ -46,6 +38,6 @@ target_deploy_status: tests_options: force_deploy: - - trusty-mitaka - hirsute-wallaby - impish-xena + - jammy-yoga diff --git a/tox.ini b/tox.ini index ba4fd5b..86d1e90 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,11 @@ 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 + [testenv:py3] basepython = python3 deps = -r{toxinidir}/requirements.txt