diff --git a/charmcraft.yaml b/charmcraft.yaml index a58f4124..e499a974 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -2,18 +2,13 @@ type: charm parts: charm: - prime: - - actions/* - - lib/* - - templates/* - - files/* after: - - update-certificates + - update-certificates charm-python-packages: # Use the updated version of setuptools (needed by jinja2). - - setuptools + - setuptools build-packages: - - git + - git update-certificates: # Ensure that certificates in the base image are up-to-date. @@ -23,16 +18,17 @@ parts: apt install -y ca-certificates update-ca-certificates -bases: - - build-on: - - name: ubuntu - channel: "20.04" - architectures: - - amd64 - run-on: - - name: ubuntu - channel: "20.04" - architectures: [amd64, s390x, ppc64el, arm64] - - 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 c02b3896..ef0fec0a 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: ceph-mon build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/beta diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 1be00105..00000000 --- a/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,261 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -local_overlay_enabled: False - -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': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: 8.0/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '9' - channel: 3.9/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - channel: quincy/edge - - ceph-mon: - charm: ch:ceph-mon - channel: quincy/edge - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-fs: - charm: ch:ceph-fs - num_units: 1 - options: - source: *openstack-origin - channel: quincy/edge - to: - - '17' - - keystone: - expose: True - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - channel: 2023.1/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - channel: 2023.1/edge - - glance: - expose: True - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - channel: 2023.1/edge - - cinder: - expose: True - charm: ch:cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - channel: 2023.1/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: 2023.1/edge - - nova-cloud-controller: - expose: True - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: 2023.1/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: 2023.1/edge - - prometheus2: - charm: ch:prometheus2 - num_units: 1 - to: - - '16' - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:ceph' - - 'ceph-mon:client' - - - - nova-compute:ceph-access - - cinder-ceph:ceph-access - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-mon:mds' - - 'ceph-fs:ceph-mds' - - - - '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' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement' - - 'keystone' - - - - 'placement' - - 'nova-cloud-controller' - - - - 'ceph-mon:prometheus' - - 'prometheus2:target' diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index b9c1033f..00000000 --- a/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,261 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat - -local_overlay_enabled: False - -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': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: 8.0/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '9' - channel: 3.9/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - channel: reef/edge - - ceph-mon: - charm: ch:ceph-mon - channel: reef/edge - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-fs: - charm: ch:ceph-fs - num_units: 1 - options: - source: *openstack-origin - channel: reef/edge - to: - - '17' - - keystone: - expose: True - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - channel: 2023.2/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - channel: 2023.2/edge - - glance: - expose: True - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - channel: 2023.2/edge - - cinder: - expose: True - charm: ch:cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - channel: 2023.2/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: 2023.2/edge - - nova-cloud-controller: - expose: True - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: 2023.2/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: 2023.2/edge - - prometheus2: - charm: ch:prometheus2 - num_units: 1 - to: - - '16' - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:ceph' - - 'ceph-mon:client' - - - - nova-compute:ceph-access - - cinder-ceph:ceph-access - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-mon:mds' - - 'ceph-fs:ceph-mds' - - - - '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' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement' - - 'keystone' - - - - 'placement' - - 'nova-cloud-controller' - - - - 'ceph-mon:prometheus' - - 'prometheus2:target' diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index e6e587c0..00000000 --- a/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,261 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal - -local_overlay_enabled: False - -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': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: 8.0/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '9' - channel: 3.9/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - channel: latest/edge - - ceph-mon: - charm: ch:ceph-mon - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-fs: - charm: ch:ceph-fs - num_units: 1 - options: - source: *openstack-origin - channel: latest/edge - to: - - '17' - - keystone: - expose: True - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - channel: latest/edge - - glance: - expose: True - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - channel: latest/edge - - cinder: - expose: True - charm: ch:cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - channel: latest/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: latest/edge - - nova-cloud-controller: - expose: True - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: latest/edge - - prometheus2: - charm: ch:prometheus2 - num_units: 1 - to: - - '16' - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:ceph' - - 'ceph-mon:client' - - - - nova-compute:ceph-access - - cinder-ceph:ceph-access - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-mon:mds' - - 'ceph-fs:ceph-mds' - - - - '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' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement' - - 'keystone' - - - - 'placement' - - 'nova-cloud-controller' - - - - 'ceph-mon:prometheus' - - 'prometheus2:target' diff --git a/tests/bundles/noble-caracal.yaml b/tests/bundles/noble-caracal.yaml index b0b80b50..b4255465 100644 --- a/tests/bundles/noble-caracal.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -35,19 +35,19 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: latest/edge glance-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: latest/edge cinder-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: latest/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: latest/edge placement-mysql-router: charm: ch:mysql-router - channel: 8.0/edge + channel: latest/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -56,14 +56,14 @@ applications: - '0' - '1' - '2' - channel: 8.0/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '9' - channel: 3.9/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd @@ -167,6 +167,7 @@ applications: prometheus2: charm: ch:prometheus2 + series: jammy num_units: 1 to: - '16' diff --git a/tests/tests.yaml b/tests/tests.yaml index 08d034d3..0f8c648b 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,13 +1,10 @@ charm_name: ceph-mon gate_bundles: - - jammy-yoga - - jammy-bobcat - - jammy-caracal - noble-caracal smoke_bundles: - - jammy-caracal + - noble-caracal configure: - install: