From f61afd5d21c96e9efa89cd93a47056985376a10f Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 26 Jan 2022 11:18:03 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I82c5640230149a227183b67aff5ce14e147cd55e Co-authored-by: Aurelien Lourot --- charmcraft.yaml | 27 +++ metadata.yaml | 3 - osci.yaml | 28 +-- tests/bundles/bionic-queens.yaml | 100 -------- tests/bundles/bionic-rocky.yaml | 113 --------- tests/bundles/bionic-stein.yaml | 113 --------- tests/bundles/bionic-train-with-fsid.yaml | 118 ---------- tests/bundles/bionic-train.yaml | 123 ---------- tests/bundles/bionic-ussuri.yaml | 123 ---------- tests/bundles/focal-ussuri-ec.yaml | 269 ---------------------- tests/bundles/focal-ussuri.yaml | 235 ------------------- tests/bundles/focal-victoria.yaml | 235 ------------------- tests/bundles/focal-wallaby.yaml | 235 ------------------- tests/bundles/focal-xena.yaml | 45 ++-- tests/bundles/focal-yoga.yaml | 45 ++-- tests/bundles/hirsute-wallaby.yaml | 237 ------------------- tests/bundles/impish-xena.yaml | 45 ++-- tests/bundles/jammy-yoga.yaml | 45 ++-- tests/tests.yaml | 14 +- 19 files changed, 151 insertions(+), 2002 deletions(-) create mode 100644 charmcraft.yaml delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train-with-fsid.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-ussuri-ec.yaml delete mode 100644 tests/bundles/focal-ussuri.yaml delete mode 100644 tests/bundles/focal-victoria.yaml delete mode 100644 tests/bundles/focal-wallaby.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 00000000..ba84f314 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,27 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml index 4543b1b1..1b7039b6 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,10 +10,7 @@ tags: - file-servers - misc series: -- bionic - focal -- groovy -- hirsute - impish peers: mon: diff --git a/osci.yaml b/osci.yaml index baacc7d5..da6cd318 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,28 +1,6 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs - - charm-queens-functional-jobs - check: - jobs: - - focal-ussuri-ec-ceph-mon - - bionic-train-with-fsid - -- job: - name: focal-ussuri-ec-ceph-mon - parent: func-target - dependencies: &smoke-jobs - - bionic-ussuri - vars: - tox_extra_args: focal-ussuri-ec -- job: - name: bionic-train-with-fsid - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: bionic-train-with-fsid + - charm-yoga-functional-jobs diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 614442e7..00000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/srv/ceph /dev/test-non-existent' - ceph-mon: - charm: ../../../ceph-mon - series: bionic - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - libvirt-image-backend: rbd - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 -- - ceph-mon:prometheus - - prometheus2:target diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index dde594de..00000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,113 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/srv/ceph /dev/test-non-existent' - source: cloud:bionic-rocky - ceph-mon: - charm: ../../../ceph-mon - series: bionic - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:bionic-rocky - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-rocky - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-rocky - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - libvirt-image-backend: rbd - openstack-origin: cloud:bionic-rocky - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-rocky - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 -- - ceph-mon:prometheus - - prometheus2:target diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 92f889eb..00000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,113 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/srv/ceph /dev/test-non-existent' - source: cloud:bionic-stein - ceph-mon: - charm: ../../../ceph-mon - series: bionic - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:bionic-stein - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-stein - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-stein - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - libvirt-image-backend: rbd - openstack-origin: cloud:bionic-stein - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-stein - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 -- - ceph-mon:prometheus - - prometheus2:target diff --git a/tests/bundles/bionic-train-with-fsid.yaml b/tests/bundles/bionic-train-with-fsid.yaml deleted file mode 100644 index d41c63b3..00000000 --- a/tests/bundles/bionic-train-with-fsid.yaml +++ /dev/null @@ -1,118 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train/proposed - ceph-mon: - charm: ../../../ceph-mon - series: bionic - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train/proposed - fsid: 3930914c-4fc5-4720-8975-b7bf554f647c - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-train/proposed - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-train/proposed - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train/proposed - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-train/proposed - libvirt-image-backend: rbd - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train/proposed - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-train/proposed - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-train/proposed - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: cloud:bionic-train -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 - - percona-cluster -- - placement - - keystone -- - placement - - nova-cloud-controller diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 4c24951a..00000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,123 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - series: bionic - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-train - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-train - libvirt-image-backend: rbd - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-train - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-train - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: cloud:bionic-train - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 - - percona-cluster -- - placement - - keystone -- - placement - - nova-cloud-controller -- - ceph-mon:prometheus - - prometheus2:target diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index bbed4302..00000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,123 +0,0 @@ -series: bionic -applications: - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - series: bionic - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-ussuri - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-ussuri - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-ussuri - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-ussuri - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - libvirt-image-backend: rbd - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-ussuri - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 -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 - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:amqp - - rabbitmq-server:amqp -- - glance:ceph - - ceph-mon:client -- - cinder:shared-db - - percona-cluster:shared-db -- - 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 -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - 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 - - percona-cluster -- - placement - - keystone -- - placement - - nova-cloud-controller -- - ceph-mon:prometheus - - prometheus2:target diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml deleted file mode 100644 index 8cedf3b2..00000000 --- a/tests/bundles/focal-ussuri-ec.yaml +++ /dev/null @@ -1,269 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -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': - '18': - '19': - '20': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '17' - - '18' - - '19' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - ceph-radosgw: - charm: cs:~openstack-charmers-next/ceph-radosgw - num_units: 1 - num_units: 1 - options: - source: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - to: - - '20' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: isa - libvirt-image-backend: rbd - to: - - '11' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: jerasure - to: - - '12' - - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: lrc - ec-profile-locality: 3 - - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - 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' - - - - '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' - - - - 'ceph-radosgw:mon' - - 'ceph-mon:radosgw' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 533bee4a..00000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,235 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -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': - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - 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' - - - - '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-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 1bfd8964..00000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,235 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -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': - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - 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' - - - - '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-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 21ce4e6f..00000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,235 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -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': - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - 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' - - - - '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-xena.yaml b/tests/bundles/focal-xena.yaml index 991293f5..82602a31 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -31,18 +31,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -50,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -63,6 +69,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: charm: ../../../ceph-mon @@ -76,43 +83,47 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '9' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '10' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/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: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: latest/edge cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -120,26 +131,30 @@ applications: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 74d5fc5d..1b264c44 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -31,18 +31,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -50,9 +55,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -63,6 +69,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: charm: ../../../ceph-mon @@ -76,43 +83,47 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '9' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '10' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/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: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: latest/edge cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -120,26 +131,30 @@ applications: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 17ee2e0a..00000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,237 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -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': - series: focal - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '3' - - '4' - - '5' - - ceph-mon: - charm: ../../../ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - libvirt-image-backend: rbd - to: - - '11' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - cinder: - expose: True - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '13' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - - nova-cloud-controller: - expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - prometheus2: -# Pin prometheus2 charm version Bug #1891942 - charm: cs:prometheus2-18 - num_units: 1 - series: focal - 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' - - - - '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/impish-xena.yaml b/tests/bundles/impish-xena.yaml index df5c37a8..90685e52 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -32,18 +32,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -51,9 +56,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -64,6 +70,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: charm: ../../../ceph-mon @@ -77,43 +84,47 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '9' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '10' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/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: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: latest/edge cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -121,26 +132,30 @@ applications: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 6f0a35a0..0b98bc77 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -32,18 +32,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -51,9 +56,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: '10G' @@ -64,6 +70,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge ceph-mon: charm: ../../../ceph-mon @@ -77,43 +84,47 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '9' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '10' + channel: latest/edge nova-compute: - charm: cs:~openstack-charmers-next/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: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: latest/edge cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' @@ -121,26 +132,30 @@ applications: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph + channel: latest/edge nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: latest/edge prometheus2: # Pin prometheus2 charm version Bug #1891942 diff --git a/tests/tests.yaml b/tests/tests.yaml index 303ddfa6..453bcaad 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,26 +1,15 @@ charm_name: ceph-mon gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-ussuri-ec - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - - bionic-rocky - - bionic-train - - bionic-train-with-fsid - focal-yoga - jammy-yoga smoke_bundles: - - focal-ussuri + - focal-xena configure: - zaza.openstack.charm_tests.glance.setup.add_lts_image @@ -35,6 +24,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga