From df934b2649c1d28faecd2dd6938cd22d8edff95d Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Thu, 5 Sep 2024 21:22:18 +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 - Add charmbuild to .zuul.yaml - Add TEST_JUJU3=1 to tox.ini to force Juju 3 Change-Id: I915bf4647e523a9c6f90c2549eab460c0c4cd23c --- .zuul.yaml | 6 + charmcraft.yaml | 24 +-- osci.yaml | 2 +- src/tox.ini | 2 +- tests/bundles/jammy-antelope.yaml | 246 ------------------------------ tests/bundles/jammy-bobcat.yaml | 246 ------------------------------ tests/bundles/jammy-caracal.yaml | 246 ------------------------------ tests/bundles/noble-caracal.yaml | 18 +-- tests/tests.yaml | 6 +- tox.ini | 16 +- 10 files changed, 45 insertions(+), 767 deletions(-) delete mode 100644 tests/bundles/jammy-antelope.yaml delete mode 100644 tests/bundles/jammy-bobcat.yaml delete mode 100644 tests/bundles/jammy-caracal.yaml diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..c714781 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,3 +2,9 @@ templates: - openstack-python3-charm-jobs - openstack-cover-jobs + + check: + jobs: + - charmbuild + vars: + charm_build_name: manila-netapp diff --git a/charmcraft.yaml b/charmcraft.yaml index 652ab74..7217725 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -19,13 +19,17 @@ parts: apt install -y ca-certificates update-ca-certificates -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 e047d95..547a897 100644 --- a/osci.yaml +++ b/osci.yaml @@ -9,5 +9,5 @@ needs_charm_build: true charm_build_name: manila-netapp build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable 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/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 500a743..0000000 --- a/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,246 +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': - '9': - # The following units are the nova compute units - '10': - constraints: mem=4G - '11': - constraints: mem=4G - '12': - -applications: - manila-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-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 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '6' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '7' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '8' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - to: - - '10' - - '11' - channel: 2024.1/edge - - manila: - charm: ch:manila - num_units: 1 - options: - openstack-origin: *openstack-origin - default-share-backend: netapp-ontap - to: - - '12' - channel: 2024.1/edge - - manila-netapp: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap - driver-handles-share-servers: False - - manila-netapp-dhss: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap-dhss - driver-handles-share-servers: True - -relations: - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'manila' - - 'rabbitmq-server' - - - 'manila' - - 'keystone' - - - 'manila:manila-plugin' - - 'manila-netapp:manila-plugin' - - - 'manila:manila-plugin' - - 'manila-netapp-dhss:manila-plugin' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-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' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - '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' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement:amqp' - - 'rabbitmq-server:amqp' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 872772b..0000000 --- a/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,246 +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': - '9': - # The following units are the nova compute units - '10': - constraints: mem=4G - '11': - constraints: mem=4G - '12': - -applications: - manila-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-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 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '6' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '7' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '8' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - to: - - '10' - - '11' - channel: 2024.1/edge - - manila: - charm: ch:manila - num_units: 1 - options: - openstack-origin: *openstack-origin - default-share-backend: netapp-ontap - to: - - '12' - channel: 2024.1/edge - - manila-netapp: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap - driver-handles-share-servers: False - - manila-netapp-dhss: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap-dhss - driver-handles-share-servers: True - -relations: - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'manila' - - 'rabbitmq-server' - - - 'manila' - - 'keystone' - - - 'manila:manila-plugin' - - 'manila-netapp:manila-plugin' - - - 'manila:manila-plugin' - - 'manila-netapp-dhss:manila-plugin' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-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' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - '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' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement:amqp' - - 'rabbitmq-server:amqp' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index 226310e..0000000 --- a/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,246 +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': - '9': - # The following units are the nova compute units - '10': - constraints: mem=4G - '11': - constraints: mem=4G - '12': - -applications: - manila-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-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 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '6' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '7' - channel: 2024.1/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '8' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - to: - - '10' - - '11' - channel: 2024.1/edge - - manila: - charm: ch:manila - num_units: 1 - options: - openstack-origin: *openstack-origin - default-share-backend: netapp-ontap - to: - - '12' - channel: 2024.1/edge - - manila-netapp: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap - driver-handles-share-servers: False - - manila-netapp-dhss: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap-dhss - driver-handles-share-servers: True - -relations: - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'manila' - - 'rabbitmq-server' - - - 'manila' - - 'keystone' - - - 'manila:manila-plugin' - - 'manila-netapp:manila-plugin' - - - 'manila:manila-plugin' - - 'manila-netapp-dhss:manila-plugin' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-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' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - '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' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement:amqp' - - 'rabbitmq-server:amqp' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/bundles/noble-caracal.yaml b/tests/bundles/noble-caracal.yaml index 000db5d..02b6334 100644 --- a/tests/bundles/noble-caracal.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -67,7 +67,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: 2024.1/edge + channel: latest/edge glance: charm: ch:glance @@ -76,7 +76,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: 2024.1/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -89,11 +89,11 @@ applications: neutron-security-groups: true to: - '5' - channel: 2024.1/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: 2024.1/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '6' - channel: 2024.1/edge + channel: latest/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '7' - channel: 2024.1/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -128,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: 2024.1/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: to: - '10' - '11' - channel: 2024.1/edge + channel: latest/edge manila: charm: ch:manila @@ -151,7 +151,7 @@ applications: default-share-backend: netapp-ontap to: - '12' - channel: 2024.1/edge + channel: latest/edge manila-netapp: charm: ../../manila-netapp.charm diff --git a/tests/tests.yaml b/tests/tests.yaml index 1386fa2..f4858c0 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,13 +1,11 @@ charm_name: manila-netapp gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal smoke_bundles: - - jammy-caracal + - noble-caracal target_deploy_status: {} configure: diff --git a/tox.ini b/tox.ini index 3e44bd9..8031900 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ setenv = VIRTUAL_ENV={envdir} CHARM_LAYERS_DIR={toxinidir}/layers CHARM_INTERFACES_DIR={toxinidir}/interfaces JUJU_REPOSITORY={toxinidir}/build + TEST_JUJU3=1 # Note(mylesjp): Force Juju 3 passenv = no_proxy http_proxy @@ -62,20 +63,27 @@ 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: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} +[testenv:py312] +basepython = python3.12 +deps = + -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:pep8] basepython = python3 -deps = flake8==3.9.2 +deps = flake8==7.1.1 git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests @@ -84,7 +92,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 =