From 30da5c94c72788764b2521c7f8469068d0322202 Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Wed, 4 Sep 2024 18:23:20 +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 Change-Id: Ia7042072220fb9be2acf37de5a7b24743b1dcf7c --- .zuul.yaml | 5 + charmcraft.yaml | 26 +- osci.yaml | 2 +- src/config.yaml | 2 +- src/metadata.yaml | 2 - src/tests/bundles/jammy-antelope.yaml | 344 -------------------------- src/tests/bundles/jammy-bobcat.yaml | 344 -------------------------- src/tests/bundles/jammy-caracal.yaml | 344 -------------------------- src/tests/bundles/noble-caracal.yaml | 20 +- src/tests/tests.yaml | 6 +- src/tox.ini | 2 +- tox.ini | 8 +- 12 files changed, 39 insertions(+), 1066 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 fd20909..7e97db4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,3 +2,8 @@ templates: - openstack-python3-charm-jobs - openstack-cover-jobs + check: + jobs: + - charmbuild + vars: + charm_build_name: magnum 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 2abc487..0f2a5ee 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: magnum build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/src/config.yaml b/src/config.yaml index 8a9bc2b..09c8b00 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -1,6 +1,6 @@ options: openstack-origin: - default: bobcat + default: caracal type: string description: | Repository from which to install. May be one of the following: diff --git a/src/metadata.yaml b/src/metadata.yaml index 0503214..532cbb8 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -9,8 +9,6 @@ description: | machines or bare metal in a cluster configuration. tags: - openstack -series: - - jammy subordinate: false requires: shared-db: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 1e0b33b..0000000 --- a/src/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,344 +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 machines are for nova-compute which needs more memory - # for the instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - '13': - '14': - '15': - '16': - '17': - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-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 - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - magnum-mysql-router: - charm: ch:mysql-router - channel: latest/edge - heat-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/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 - to: - - '10' - - '11' - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '12' - channel: latest/edge - - magnum: - charm: ../../../magnum.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '13' - - '14' - - '15' - - magnum-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '16' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - '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' - - - - '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' - - - - '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:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' - - - - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' - - - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'magnum:certificates' - - 'vault:certificates' - - - - 'magnum:ha' - - 'magnum-hacluster:ha' - - - - 'heat:amqp' - - 'rabbitmq-server:amqp' - - - - 'heat:identity-service' - - 'keystone:identity-service' - - - - 'heat:shared-db' - - 'heat-mysql-router:shared-db' - - - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'heat:certificates' - - 'vault:certificates' - - - - 'barbican:amqp' - - 'rabbitmq-server:amqp' - - - - 'barbican:identity-service' - - 'keystone:identity-service' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 5e1874e..0000000 --- a/src/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,344 +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 machines are for nova-compute which needs more memory - # for the instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - '13': - '14': - '15': - '16': - '17': - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-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 - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - magnum-mysql-router: - charm: ch:mysql-router - channel: latest/edge - heat-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/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 - to: - - '10' - - '11' - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '12' - channel: latest/edge - - magnum: - charm: ../../../magnum.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '13' - - '14' - - '15' - - magnum-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '16' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - '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' - - - - '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' - - - - '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:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' - - - - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' - - - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'magnum:certificates' - - 'vault:certificates' - - - - 'magnum:ha' - - 'magnum-hacluster:ha' - - - - 'heat:amqp' - - 'rabbitmq-server:amqp' - - - - 'heat:identity-service' - - 'keystone:identity-service' - - - - 'heat:shared-db' - - 'heat-mysql-router:shared-db' - - - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'heat:certificates' - - 'vault:certificates' - - - - 'barbican:amqp' - - 'rabbitmq-server:amqp' - - - - 'barbican:identity-service' - - 'keystone:identity-service' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index ac73be4..0000000 --- a/src/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,344 +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 machines are for nova-compute which needs more memory - # for the instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - '13': - '14': - '15': - '16': - '17': - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-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 - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - magnum-mysql-router: - charm: ch:mysql-router - channel: latest/edge - heat-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: 2024.1/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: 2024.1/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: 2024.1/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 - to: - - '10' - - '11' - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '12' - channel: latest/edge - - magnum: - charm: ../../../magnum.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '13' - - '14' - - '15' - - magnum-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '16' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: 2024.1/edge - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute: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:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - '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' - - - - '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' - - - - '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:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' - - - - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' - - - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'magnum:certificates' - - 'vault:certificates' - - - - 'magnum:ha' - - 'magnum-hacluster:ha' - - - - 'heat:amqp' - - 'rabbitmq-server:amqp' - - - - 'heat:identity-service' - - 'keystone:identity-service' - - - - 'heat:shared-db' - - 'heat-mysql-router:shared-db' - - - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'heat:certificates' - - 'vault:certificates' - - - - 'barbican:amqp' - - 'rabbitmq-server:amqp' - - - - 'barbican:identity-service' - - 'keystone:identity-service' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index 9ac8392..4ae6d0c 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -90,7 +90,7 @@ applications: network-manager: Neutron to: - '4' - channel: 2024.1/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -103,7 +103,7 @@ applications: neutron-security-groups: true to: - '5' - channel: 2024.1/edge + channel: latest/edge keystone: charm: ch:keystone @@ -112,7 +112,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: 2024.1/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -122,7 +122,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: 2024.1/edge + channel: latest/edge glance: charm: ch:glance @@ -131,11 +131,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: 2024.1/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: 2024.1/edge + channel: latest/edge placement: charm: ch:placement @@ -144,7 +144,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: 2024.1/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -156,7 +156,7 @@ applications: to: - '10' - '11' - channel: 2024.1/edge + channel: latest/edge vault: charm: ch:vault @@ -190,7 +190,7 @@ applications: openstack-origin: *openstack-origin to: - '16' - channel: 2024.1/edge + channel: latest/edge barbican: charm: ch:barbican @@ -199,7 +199,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: 2024.1/edge + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 9ae8058..2cad45c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,11 +1,9 @@ charm_name: magnum smoke_bundles: - - jammy-caracal + - noble-caracal gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal configure: 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 =