From 05f07b44da153f67e38ce415e57f6ef8d3ca388d Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Fri, 30 Aug 2024 17:13:07 +0000 Subject: [PATCH] Add charmcraft 3 support Summary of changes: - Update the charmcraft.yaml file to use base and platforms, only allowing noble support. - Update config to default to caracal. - Update osci.yaml to use the charmcraft 3.x/beta - Drop non-noble tests - Update constraints file from -2024.1.txt to -noble.txt Change-Id: I37e8e4f804993bb51f78bc1611cfc1e44f4ae03f --- .zuul.yaml | 5 + charmcraft.yaml | 26 +- osci.yaml | 2 +- src/config.yaml | 2 +- src/metadata.yaml | 2 +- src/tests/bundles/jammy-antelope.yaml | 416 -------------------------- src/tests/bundles/jammy-bobcat.yaml | 416 -------------------------- src/tests/bundles/jammy-caracal.yaml | 416 -------------------------- src/tests/bundles/noble-caracal.yaml | 26 +- src/tests/tests.yaml | 6 +- src/tox.ini | 2 +- tox.ini | 8 +- 12 files changed, 43 insertions(+), 1284 deletions(-) delete mode 100644 src/tests/bundles/jammy-antelope.yaml delete mode 100644 src/tests/bundles/jammy-bobcat.yaml delete mode 100644 src/tests/bundles/jammy-caracal.yaml diff --git a/.zuul.yaml b/.zuul.yaml index af4b7f3..665eeab 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,3 +1,8 @@ - project: templates: - openstack-python3-charm-jobs + check: + jobs: + - charmbuild + vars: + charm_build_name: masakari diff --git a/charmcraft.yaml b/charmcraft.yaml index c31dea1..c31545a 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -7,18 +7,22 @@ parts: build-packages: - libpython3-dev build-snaps: - - charm + - charm/latest/edge build-environment: - CHARM_INTERFACES_DIR: /root/project/interfaces/ - CHARM_LAYERS_DIR: /root/project/layers/ -bases: - - build-on: - - name: ubuntu - channel: "22.04" - architectures: - - amd64 - run-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64, s390x, ppc64el, arm64] +base: ubuntu@24.04 +platforms: + amd64: + build-on: amd64 + build-for: amd64 + arm64: + build-on: arm64 + build-for: arm64 + ppc64el: + build-on: ppc64el + build-for: ppc64el + s390x: + build-on: s390x + build-for: s390x diff --git a/osci.yaml b/osci.yaml index 82c542f..6549c90 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: masakari build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/src/config.yaml b/src/config.yaml index e24b00e..96f0b96 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -32,4 +32,4 @@ options: The period where expired notifications are checked and processed, specified in seconds. openstack-origin: - default: bobcat + default: caracal diff --git a/src/metadata.yaml b/src/metadata.yaml index 0738d18..94e1ff0 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -10,4 +10,4 @@ description: | tags: - openstack series: - - jammy + - noble diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index b0ee740..0000000 --- a/src/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,416 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -local_overlay_enabled: True - -series: jammy - -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': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - masakari-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - channel: 2024.1/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - num_units: 0 - channel: 2024.1/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '11' - channel: latest/edge - - masakari: - charm: ../../../masakari.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - channel: reef/edge - - ceph-osd: - charm: ch:ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - channel: reef/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: 2024.1/edge - - masakari-monitors: - charm: ch:masakari-monitors - channel: 2024.1/edge - - hacluster: - charm: ch:hacluster - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - pacemaker-remote: - charm: ch:pacemaker-remote - options: - enable-stonith: False - enable-resources: False - channel: latest/edge - - vault: - num_units: 1 - charm: ch:vault - to: - - '21' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - '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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 209b232..0000000 --- a/src/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,416 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat - -local_overlay_enabled: True - -series: jammy - -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': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - masakari-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - channel: 2024.1/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - num_units: 0 - channel: 2024.1/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '11' - channel: latest/edge - - masakari: - charm: ../../../masakari.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - channel: reef/edge - - ceph-osd: - charm: ch:ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - channel: reef/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: 2024.1/edge - - masakari-monitors: - charm: ch:masakari-monitors - channel: 2024.1/edge - - hacluster: - charm: ch:hacluster - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - pacemaker-remote: - charm: ch:pacemaker-remote - options: - enable-stonith: False - enable-resources: False - channel: latest/edge - - vault: - num_units: 1 - charm: ch:vault - to: - - '21' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - '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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index 1836b5b..0000000 --- a/src/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,416 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal - -local_overlay_enabled: True - -series: jammy - -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': - '8': - constraints: mem=4096M - '9': - constraints: mem=4096M - '10': - constraints: mem=4096M - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - '22': - '23': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - masakari-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '3' - channel: 2024.1/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - to: - - '4' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - admin-password: openstack - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '5' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - to: - - '7' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - num_units: 0 - channel: 2024.1/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - worker-multiplier: 0.25 - debug: true - to: - - '23' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 3 - constraints: mem=4G - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - to: - - '8' - - '9' - - '10' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '11' - channel: latest/edge - - masakari: - charm: ../../../masakari.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - to: - - '15' - - '16' - - '17' - channel: reef/edge - - ceph-osd: - charm: ch:ceph-osd - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: cinder,40G - to: - - '18' - - '19' - - '20' - channel: reef/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: 2024.1/edge - - masakari-monitors: - charm: ch:masakari-monitors - channel: 2024.1/edge - - hacluster: - charm: ch:hacluster - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - pacemaker-remote: - charm: ch:pacemaker-remote - options: - enable-stonith: False - enable-resources: False - channel: latest/edge - - vault: - num_units: 1 - charm: ch:vault - to: - - '21' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '22' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - '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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'masakari:shared-db' - - 'masakari-mysql-router:shared-db' - - - 'masakari-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'masakari:amqp' - - 'rabbitmq-server:amqp' - - - - 'masakari:identity-service' - - 'keystone:identity-service' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - - 'nova-compute:juju-info' - - 'masakari-monitors:container' - - - - 'masakari:ha' - - 'hacluster:ha' - - - - 'keystone:identity-credentials' - - 'masakari-monitors:identity-credentials' - - - - 'nova-compute:juju-info' - - 'pacemaker-remote:juju-info' - - - - 'hacluster:pacemaker-remote' - - 'pacemaker-remote:pacemaker-remote' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'masakari:certificates' - - - - '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' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index ad8e5e4..fcf9ad5 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -83,7 +83,7 @@ applications: worker-multiplier: 0.25 to: - '3' - channel: 2024.1/edge + channel: latest/edge cinder: charm: ch:cinder @@ -94,7 +94,7 @@ applications: glance-api-version: 2 to: - '4' - channel: 2024.1/edge + channel: latest/edge keystone: charm: ch:keystone @@ -105,7 +105,7 @@ applications: worker-multiplier: 0.25 to: - '5' - channel: 2024.1/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -118,7 +118,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: 2024.1/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -129,12 +129,12 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: 2024.1/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: 2024.1/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -146,7 +146,7 @@ applications: debug: true to: - '23' - channel: 2024.1/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -167,7 +167,7 @@ applications: - '8' - '9' - '10' - channel: 2024.1/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -196,7 +196,7 @@ applications: - '15' - '16' - '17' - channel: reef/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd @@ -210,15 +210,15 @@ applications: - '18' - '19' - '20' - channel: reef/edge + channel: latest/edge cinder-ceph: charm: ch:cinder-ceph - channel: 2024.1/edge + channel: latest/edge masakari-monitors: charm: ch:masakari-monitors - channel: 2024.1/edge + channel: latest/edge hacluster: charm: ch:hacluster @@ -248,7 +248,7 @@ applications: openstack-origin: *openstack-origin to: - '22' - channel: 2024.1/edge + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index a8c430a..f835096 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -13,13 +13,11 @@ configure: - zaza.openstack.charm_tests.masakari.setup.create_segments gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal smoke_bundles: - - jammy-caracal + - noble-caracal target_deploy_status: easyrsa: workload-status-message-prefix: Certificate Authority connected. diff --git a/src/tox.ini b/src/tox.ini index 2ddcccd..3ce5e85 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -26,7 +26,7 @@ passenv = OS_* TEST_* deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt [testenv:pep8] diff --git a/tox.ini b/tox.ini index dfa7936..81302e8 100644 --- a/tox.ini +++ b/tox.ini @@ -62,21 +62,21 @@ commands = [testenv:py3] basepython = python3 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:py312] basepython = python3.12 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:py310] basepython = python3.10 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} @@ -91,7 +91,7 @@ commands = flake8 {posargs} src unit_tests # https://github.com/openstack/nova/blob/master/tox.ini basepython = python3 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt setenv =