diff --git a/.zuul.yaml b/.zuul.yaml index 69974080..fd20909e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: templates: - - openstack-python3-charm-yoga-jobs - openstack-python3-charm-jobs - openstack-cover-jobs diff --git a/config.yaml b/config.yaml index 23dff176..9be01566 100644 --- a/config.yaml +++ b/config.yaml @@ -10,7 +10,7 @@ options: If set to True, supporting services will log to syslog. source: type: string - default: bobcat + default: caracal description: | Optional configuration to support use of additional sources such as: . diff --git a/osci.yaml b/osci.yaml index d1262adf..c02b3896 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,6 +1,5 @@ - project: templates: - - charm-unit-jobs-py38 - charm-unit-jobs-py310 - charm-functional-jobs vars: @@ -8,15 +7,3 @@ charm_build_name: ceph-mon build_type: charmcraft charmcraft_channel: 2.x/stable - check: - jobs: - - new-install-focal-yoga -- job: - name: new-install-focal-yoga - parent: func-target - dependencies: - - osci-lint - - charm-build - - tox-py38 - vars: - tox_extra_args: '-- install:local-focal-yoga' diff --git a/tests/bundles/local-focal-yoga.yaml b/tests/bundles/local-focal-yoga.yaml deleted file mode 100644 index 98c46c8b..00000000 --- a/tests/bundles/local-focal-yoga.yaml +++ /dev/null @@ -1,262 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-yoga - -series: focal - -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.19/edge - glance-mysql-router: - charm: ch:mysql-router - channel: 8.0.19/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: 8.0.19/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: 8.0.19/edge - placement-mysql-router: - charm: ch:mysql-router - channel: 8.0.19/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: 8.0.19/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: ../../ceph-mon.charm - 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' - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - channel: 3.9/edge - - keystone: - expose: True - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - channel: yoga/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - channel: yoga/edge - - glance: - expose: True - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - channel: yoga/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: yoga/edge - - cinder-ceph: - charm: ch:cinder-ceph - channel: yoga/edge - - nova-cloud-controller: - expose: True - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: yoga/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/focal-yoga.yaml b/tests/bundles/noble-caracal.yaml similarity index 89% rename from tests/bundles/focal-yoga.yaml rename to tests/bundles/noble-caracal.yaml index bb475bc1..b0b80b50 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -1,7 +1,9 @@ variables: - openstack-origin: &openstack-origin cloud:focal-yoga + openstack-origin: &openstack-origin distro -series: focal +local_overlay_enabled: False + +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -33,30 +35,35 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: 8.0.19/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: 8.0.19/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: 8.0.19/edge + channel: 8.0/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: 8.0.19/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: 8.0.19/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' - '2' - channel: 8.0.19/edge + 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 @@ -70,11 +77,11 @@ applications: - '3' - '4' - '5' - channel: quincy/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon - channel: quincy/edge + channel: latest/edge num_units: 3 options: source: *openstack-origin @@ -89,19 +96,10 @@ applications: num_units: 1 options: source: *openstack-origin - channel: quincy/edge + channel: latest/edge to: - '17' - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - channel: 3.9/edge - keystone: expose: True charm: ch:keystone @@ -110,7 +108,7 @@ applications: openstack-origin: *openstack-origin to: - '10' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -120,7 +118,7 @@ applications: libvirt-image-backend: rbd to: - '11' - channel: yoga/edge + channel: latest/edge glance: expose: True @@ -130,7 +128,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: yoga/edge + channel: latest/edge cinder: expose: True @@ -142,11 +140,11 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: yoga/edge + channel: latest/edge cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: latest/edge nova-cloud-controller: expose: True @@ -156,7 +154,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement @@ -165,7 +163,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: yoga/edge + channel: latest/edge prometheus2: charm: ch:prometheus2 diff --git a/tests/tests.yaml b/tests/tests.yaml index af26df09..08d034d3 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,14 +1,13 @@ charm_name: ceph-mon gate_bundles: - - focal-xena - - focal-yoga - jammy-yoga - jammy-bobcat - jammy-caracal + - noble-caracal smoke_bundles: - - focal-yoga + - jammy-caracal configure: - install: