diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..12c9de3 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: watcher diff --git a/charmcraft.yaml b/charmcraft.yaml index 315395b..2476543 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -9,16 +9,22 @@ parts: - python3-dev source: src/ build-snaps: - - charm + - charm/latest/edge build-environment: - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/ - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/ -bases: - - build-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64, arm64, ppc64el, s390x] + +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 567c14a..a96d1cd 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: watcher build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/src/metadata.yaml b/src/metadata.yaml index 0ca2b72..512db03 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -9,8 +9,6 @@ description: | OpenStack Train or later is required. 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 4b30224..0000000 --- a/src/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,287 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -series: &series jammy - -applications: - - keystone-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 - gnocchi-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-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 - watcher-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - - keystone: - charm: ch:keystone - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - watcher: - charm: ../../../watcher.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - datasources: gnocchi - planner: weight - planner-config: > - { - "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60", - "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2" - } - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: false - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - constraints: "mem=8G" - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - enable-live-migration: true - debug: true - config-flags: "compute_monitors=cpu.virt_driver" - libvirt-image-backend: "rbd" - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - - ovn-central: - charm: ch:ovn-central - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: 2024.1/edge - - ceilometer: - charm: ch:ceilometer - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - gnocchi: - charm: ch:gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - ceilometer-agent: - charm: ch:ceilometer-agent - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - series: jammy - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '20G' - options: - source: *openstack-origin - channel: reef/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - channel: reef/edge - -relations: -- - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' -- - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' -- - 'ovn-central:certificates' - - 'vault:certificates' -- - 'ovn-chassis:certificates' - - 'vault:certificates' -- - 'ovn-chassis' - - 'nova-compute' -- - 'ovn-chassis' - - 'ovn-central' -- - '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' -- - '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-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' -- - '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' -- - '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' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' -- - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'ceph-mon:client' - - 'nova-compute:ceph' -- - 'ovn-central:ovsdb-cms' - - 'neutron-api-plugin-ovn:ovsdb-cms' -- - 'neutron-api:neutron-plugin-api-subordinate' - - 'neutron-api-plugin-ovn:neutron-plugin' -- - 'neutron-api-plugin-ovn:certificates' - - 'vault:certificates' -- - 'watcher:certificates' - - 'vault:certificates' -- - 'keystone:certificates' - - 'vault:certificates' -- - 'ceilometer:certificates' - - 'vault:certificates' -- - 'nova-cloud-controller:certificates' - - 'vault:certificates' -- - 'gnocchi:certificates' - - 'vault:certificates' -- - 'glance:certificates' - - 'vault:certificates' -- - 'placement:certificates' - - 'vault:certificates' -- - 'neutron-api:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 80ee38d..0000000 --- a/src/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,287 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat - -series: &series jammy - -applications: - - keystone-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 - gnocchi-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-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 - watcher-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - - keystone: - charm: ch:keystone - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - watcher: - charm: ../../../watcher.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - datasources: gnocchi - planner: weight - planner-config: > - { - "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60", - "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2" - } - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: false - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - constraints: "mem=8G" - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - enable-live-migration: true - debug: true - config-flags: "compute_monitors=cpu.virt_driver" - libvirt-image-backend: "rbd" - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - - ovn-central: - charm: ch:ovn-central - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: 2024.1/edge - - ceilometer: - charm: ch:ceilometer - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - gnocchi: - charm: ch:gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - ceilometer-agent: - charm: ch:ceilometer-agent - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - series: jammy - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '20G' - options: - source: *openstack-origin - channel: reef/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - channel: reef/edge - -relations: -- - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' -- - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' -- - 'ovn-central:certificates' - - 'vault:certificates' -- - 'ovn-chassis:certificates' - - 'vault:certificates' -- - 'ovn-chassis' - - 'nova-compute' -- - 'ovn-chassis' - - 'ovn-central' -- - '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' -- - '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-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' -- - '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' -- - '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' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' -- - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'ceph-mon:client' - - 'nova-compute:ceph' -- - 'ovn-central:ovsdb-cms' - - 'neutron-api-plugin-ovn:ovsdb-cms' -- - 'neutron-api:neutron-plugin-api-subordinate' - - 'neutron-api-plugin-ovn:neutron-plugin' -- - 'neutron-api-plugin-ovn:certificates' - - 'vault:certificates' -- - 'watcher:certificates' - - 'vault:certificates' -- - 'keystone:certificates' - - 'vault:certificates' -- - 'ceilometer:certificates' - - 'vault:certificates' -- - 'nova-cloud-controller:certificates' - - 'vault:certificates' -- - 'gnocchi:certificates' - - 'vault:certificates' -- - 'glance:certificates' - - 'vault:certificates' -- - 'placement:certificates' - - 'vault:certificates' -- - 'neutron-api:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index 89ef4b3..0000000 --- a/src/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,287 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal - -series: &series jammy - -applications: - - keystone-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 - gnocchi-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-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 - watcher-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - - keystone: - charm: ch:keystone - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - watcher: - charm: ../../../watcher.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - datasources: gnocchi - planner: weight - planner-config: > - { - "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60", - "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2" - } - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: false - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - channel: 2024.1/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - constraints: "mem=8G" - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - enable-live-migration: true - debug: true - config-flags: "compute_monitors=cpu.virt_driver" - libvirt-image-backend: "rbd" - channel: 2024.1/edge - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - - ovn-central: - charm: ch:ovn-central - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: 2024.1/edge - - ceilometer: - charm: ch:ceilometer - channel: 2024.1/edge - num_units: 1 - options: - openstack-origin: *openstack-origin - - gnocchi: - charm: ch:gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: 2024.1/edge - - ceilometer-agent: - charm: ch:ceilometer-agent - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - series: jammy - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '20G' - options: - source: *openstack-origin - channel: reef/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - channel: reef/edge - -relations: -- - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' -- - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'watcher:shared-db' - - 'watcher-mysql-router:shared-db' -- - 'watcher-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'keystone:identity-service' - - 'watcher:identity-service' -- - 'rabbitmq-server:amqp' - - 'watcher:amqp' -- - 'ovn-central:certificates' - - 'vault:certificates' -- - 'ovn-chassis:certificates' - - 'vault:certificates' -- - 'ovn-chassis' - - 'nova-compute' -- - 'ovn-chassis' - - 'ovn-central' -- - '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' -- - '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-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' -- - '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' -- - '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' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' -- - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'ceph-mon:client' - - 'nova-compute:ceph' -- - 'ovn-central:ovsdb-cms' - - 'neutron-api-plugin-ovn:ovsdb-cms' -- - 'neutron-api:neutron-plugin-api-subordinate' - - 'neutron-api-plugin-ovn:neutron-plugin' -- - 'neutron-api-plugin-ovn:certificates' - - 'vault:certificates' -- - 'watcher:certificates' - - 'vault:certificates' -- - 'keystone:certificates' - - 'vault:certificates' -- - 'ceilometer:certificates' - - 'vault:certificates' -- - 'nova-cloud-controller:certificates' - - 'vault:certificates' -- - 'gnocchi:certificates' - - 'vault:certificates' -- - 'glance:certificates' - - 'vault:certificates' -- - 'placement:certificates' - - 'vault:certificates' -- - 'neutron-api:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index e16a8f2..f504ed9 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -42,7 +42,7 @@ applications: keystone: charm: ch:keystone - channel: 2024.1/edge + channel: latest/edge num_units: 1 options: openstack-origin: *openstack-origin @@ -68,7 +68,7 @@ applications: openstack-origin: *openstack-origin network-manager: Neutron debug: true - channel: 2024.1/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -78,21 +78,21 @@ applications: openstack-origin: *openstack-origin flat-network-providers: physnet1 neutron-security-groups: true - channel: 2024.1/edge + channel: latest/edge glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin - channel: 2024.1/edge + channel: latest/edge placement: charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin - channel: 2024.1/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -106,7 +106,7 @@ applications: debug: true config-flags: "compute_monitors=cpu.virt_driver" libvirt-image-backend: "rbd" - channel: 2024.1/edge + channel: latest/edge vault: charm: ch:vault @@ -126,11 +126,11 @@ applications: neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: 2024.1/edge + channel: latest/edge ceilometer: charm: ch:ceilometer - channel: 2024.1/edge + channel: latest/edge num_units: 1 options: openstack-origin: *openstack-origin @@ -140,11 +140,11 @@ applications: num_units: 1 options: openstack-origin: *openstack-origin - channel: 2024.1/edge + channel: latest/edge ceilometer-agent: charm: ch:ceilometer-agent - channel: 2024.1/edge + channel: latest/edge memcached: charm: ch:memcached @@ -158,7 +158,7 @@ applications: osd-devices: '20G' options: source: *openstack-origin - channel: reef/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon @@ -166,7 +166,7 @@ applications: options: source: *openstack-origin monitor-count: '3' - channel: reef/edge + channel: latest/edge relations: - - 'keystone:shared-db' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index f01333e..8164b4e 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,10 +1,8 @@ charm_name: watcher gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal smoke_bundles: - - jammy-caracal + - noble-caracal configure: - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation - zaza.openstack.charm_tests.ceilometer.setup.basic_setup diff --git a/src/tox.ini b/src/tox.ini index af08ceb..c2bac2e 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -20,7 +20,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 55b0e76..44097df 100644 --- a/tox.ini +++ b/tox.ini @@ -55,35 +55,35 @@ 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:py38] basepython = python3.8 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:py311] basepython = python3.11 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}