diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 0000000..b6d2452 --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,7 @@ +# NOTES(lourot): +# * We don't install charmcraft via pip anymore because it anyway spins up a +# container and scp the system's charmcraft snap inside it. So the charmcraft +# snap is necessary on the system anyway. +# * `tox -e build` successfully validated with charmcraft 1.2.1 + +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..4968216 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,25 @@ +type: charm + +parts: + charm: + build-packages: + - tox + - git + - python3-dev + override-build: | + apt-get install ca-certificates -y + tox -e build-reactive + override-stage: | + echo "Copying charm to staging area: $CHARMCRAFT_STAGE" + NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds) + cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/ + override-prime: | + # For some reason, the normal priming chokes on the fact that there's a + # hooks directory. + cp -r $CHARMCRAFT_STAGE/* . + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 12d7f88..4f03970 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,77 +1,17 @@ - project: templates: - - charm-yoga-unit-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 check: jobs: - - bionic-train_ceph-rbd-mirror - - bionic-stein_ceph-rbd-mirror - - bionic-queens_ceph-rbd-mirror - - bionic-ussuri_ceph-rbd-mirror - - focal-ussuri_ceph-rbd-mirror - - focal-victoria_ceph-rbd-mirror - - focal-wallaby_ceph-rbd-mirror - - focal-xena_ceph-rbd-mirror - - focal-yoga_ceph-rbd-mirror: + - focal-xena + - focal-yoga: voting: false - - hirsute-wallaby_ceph-rbd-mirror - - impish-xena_ceph-rbd-mirror: + - impish-xena: voting: false - - jammy-yoga_ceph-rbd-mirror: + - jammy-yoga: voting: false vars: needs_charm_build: true charm_build_name: ceph-rbd-mirror - -- job: - name: bionic-train_ceph-rbd-mirror - parent: bionic-train - dependencies: - - osci-lint - - tox-py36 - - tox-py38 - - tox-py39 -- job: - name: bionic-queens_ceph-rbd-mirror - parent: bionic-queens - dependencies: &smoke-jobs - - bionic-train_ceph-rbd-mirror -- job: - name: bionic-stein_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: bionic-ussuri_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: focal-ussuri_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: focal-victoria_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: focal-wallaby_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: focal-xena_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: focal-yoga_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: hirsute-wallaby_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: impish-xena_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs -- job: - name: jammy-yoga_ceph-rbd-mirror - parent: bionic-stein - dependencies: *smoke-jobs + build_type: charmcraft diff --git a/rename.sh b/rename.sh new file mode 100755 index 0000000..d0c35c9 --- /dev/null +++ b/rename.sh @@ -0,0 +1,13 @@ +#!/bin/bash +charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') +echo "renaming ${charm}_*.charm to ${charm}.charm" +echo -n "pwd: " +pwd +ls -al +echo "Removing bad downloaded charm maybe?" +if [[ -e "${charm}.charm" ]]; +then + rm "${charm}.charm" +fi +echo "Renaming charm here." +mv ${charm}_*.charm ${charm}.charm diff --git a/src/metadata.yaml b/src/metadata.yaml index f141caf..a07cf96 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -15,10 +15,7 @@ tags: - file-servers - misc series: -- bionic - focal -- groovy -- hirsute - impish extra-bindings: public: diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..9c7afb7 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -4,6 +4,9 @@ # https://github.com/openstack-charmers/release-tools # +# Need tox to be available from tox... inception yes, but its a workaround for now +tox + # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-queens-e2e-lxd.yaml b/src/tests/bundles/bionic-queens-e2e-lxd.yaml deleted file mode 100644 index 40b8dab..0000000 --- a/src/tests/bundles/bionic-queens-e2e-lxd.yaml +++ /dev/null @@ -1,207 +0,0 @@ -series: bionic -machines: - '0': - constraints: mem=16G - series: bionic - '1': - constraints: mem=16G - series: bionic - '2': - constraints: mem=16G - series: bionic - '3': - constraints: mem=16G - series: bionic - '4': - constraints: mem=16G - series: bionic - '5': - constraints: mem=16G - series: bionic - '6': - constraints: mem=16G - series: bionic - '7': - constraints: mem=16G - series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:0 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:2 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - bindings: - '': libvirt-maas - to: - - lxd:0 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:1 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:2 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - 0 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - lxd:0 - - lxd:1 - - lxd:2 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - osd-devices: /dev/vdb - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 0 - - 1 - - 2 - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 3 - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - lxd:4 - - lxd:5 - - lxd:6 - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - osd-devices: /dev/vdb - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 4 - - 5 - - 6 - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 7 -relations: -- - mysql - - keystone -- - mysql - - cinder -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - keystone:identity-service - - nova-cloud-controller:identity-service -- - rabbitmq-server:amqp - - nova-cloud-controller:amqp -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - neutron-openvswitch:neutron-plugin - - nova-compute:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service diff --git a/src/tests/bundles/bionic-queens-e2e.yaml b/src/tests/bundles/bionic-queens-e2e.yaml deleted file mode 100644 index 40b8dab..0000000 --- a/src/tests/bundles/bionic-queens-e2e.yaml +++ /dev/null @@ -1,207 +0,0 @@ -series: bionic -machines: - '0': - constraints: mem=16G - series: bionic - '1': - constraints: mem=16G - series: bionic - '2': - constraints: mem=16G - series: bionic - '3': - constraints: mem=16G - series: bionic - '4': - constraints: mem=16G - series: bionic - '5': - constraints: mem=16G - series: bionic - '6': - constraints: mem=16G - series: bionic - '7': - constraints: mem=16G - series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:0 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:1 - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:2 - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - bindings: - '': libvirt-maas - to: - - lxd:0 - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:1 - neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch - num_units: 0 - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - bindings: - '': libvirt-maas - to: - - lxd:2 - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - 0 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - lxd:0 - - lxd:1 - - lxd:2 - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - osd-devices: /dev/vdb - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 0 - - 1 - - 2 - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 3 - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - lxd:4 - - lxd:5 - - lxd:6 - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - osd-devices: /dev/vdb - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 4 - - 5 - - 6 - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro - bindings: - public: libvirt-maas - cluster: libvirt-default - to: - - 7 -relations: -- - mysql - - keystone -- - mysql - - cinder -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote -- - mysql:shared-db - - nova-cloud-controller:shared-db -- - keystone:identity-service - - nova-cloud-controller:identity-service -- - rabbitmq-server:amqp - - nova-cloud-controller:amqp -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - mysql:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - neutron-openvswitch:neutron-plugin - - nova-compute:neutron-plugin -- - neutron-openvswitch:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index b9ffc25..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,111 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: distro - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: distro - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: distro - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: distro - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: distro - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: distro - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: distro -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/bionic-rocky-site-a.yaml b/src/tests/bundles/bionic-rocky-site-a.yaml deleted file mode 100644 index ab033ec..0000000 --- a/src/tests/bundles/bionic-rocky-site-a.yaml +++ /dev/null @@ -1,86 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-rocky - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-rocky - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-rocky - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-rocky - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-rocky -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local diff --git a/src/tests/bundles/bionic-rocky-site-b.yaml b/src/tests/bundles/bionic-rocky-site-b.yaml deleted file mode 100644 index 2f37796..0000000 --- a/src/tests/bundles/bionic-rocky-site-b.yaml +++ /dev/null @@ -1,27 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-rocky - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-rocky - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-rocky -relations: -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 2c6ba1d..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,114 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-rocky - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-rocky - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-rocky - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-rocky - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-rocky - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-rocky - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-rocky - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-rocky -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 8ededfd..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,114 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-stein - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-stein - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-stein - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-stein - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-stein - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-stein - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-stein - bluestore: False - use-direct-io: False - osd-devices: /opt - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-stein -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/bionic-train-image-mirroring.yaml b/src/tests/bundles/bionic-train-image-mirroring.yaml deleted file mode 100644 index 80b210c..0000000 --- a/src/tests/bundles/bionic-train-image-mirroring.yaml +++ /dev/null @@ -1,120 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-train - cinder: - 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 - num_units: 0 - options: - rbd-mirroring-mode: image - glance: - charm: cs:~openstack-charmers-next/glance - 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 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-train - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-train - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-train - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-train - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-train - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-train -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote -- - cinder-ceph:ceph-replication-device - - ceph-mon-b:client diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 7d3b949..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,116 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-train - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - 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 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-train - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-train - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-train - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-train - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-train - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-train -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/bionic-ussuri-image-mirroring.yaml b/src/tests/bundles/bionic-ussuri-image-mirroring.yaml deleted file mode 100644 index 3e95360..0000000 --- a/src/tests/bundles/bionic-ussuri-image-mirroring.yaml +++ /dev/null @@ -1,120 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-ussuri - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-ussuri - cinder: - 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 - num_units: 0 - options: - rbd-mirroring-mode: image - glance: - charm: cs:~openstack-charmers-next/glance - 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 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-ussuri - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-ussuri - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-ussuri - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-ussuri - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-ussuri - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-ussuri -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote -- - cinder-ceph:ceph-replication-device - - ceph-mon-b:client diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index a62d70f..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,116 +0,0 @@ -series: bionic -applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: cloud:bionic-ussuri - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: cloud:bionic-ussuri - cinder: - 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 - num_units: 0 - glance: - charm: cs:~openstack-charmers-next/glance - 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 - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-ussuri - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-ussuri - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-ussuri - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-ussuri - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: cloud:bionic-ussuri - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - ceph-rbd-mirror-b: - series: bionic - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: cloud:bionic-ussuri -relations: -- - mysql - - keystone -- - mysql - - cinder -- - mysql - - glance -- - rabbitmq-server - - cinder -- - keystone - - cinder -- - keystone - - glance -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/focal-ussuri-image-mirroring.yaml b/src/tests/bundles/focal-ussuri-image-mirroring.yaml deleted file mode 100644 index ea148e3..0000000 --- a/src/tests/bundles/focal-ussuri-image-mirroring.yaml +++ /dev/null @@ -1,233 +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': - '21': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - to: - - '5' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - options: - rbd-mirroring-mode: image - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '7' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - to: - - '11' - - '12' - - '13' - - ceph-rbd-mirror: - series: focal - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - to: - - '14' - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '15' - - '16' - - '17' - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - to: - - '18' - - '19' - - '20' - - ceph-rbd-mirror-b: - series: focal - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - to: - - '21' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-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' - - - - 'rabbitmq-server' - - 'cinder' - - - - 'keystone' - - 'cinder' - - - - 'keystone' - - 'glance' - - - - 'cinder' - - 'cinder-ceph' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph-replication-device' - - 'ceph-mon-b:client' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance' - - 'ceph-mon' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'ceph-mon' - - 'ceph-rbd-mirror:ceph-local' - - - - 'ceph-mon' - - 'ceph-rbd-mirror-b:ceph-remote' - - - - 'ceph-mon-b:osd' - - 'ceph-osd-b:mon' - - - - 'ceph-mon-b' - - 'ceph-rbd-mirror-b:ceph-local' - - - - 'ceph-mon-b' - - 'ceph-rbd-mirror:ceph-remote' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 8294b09..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,228 +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': - '21': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - glance-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - to: - - '5' - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - to: - - '7' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - to: - - '11' - - '12' - - '13' - - ceph-rbd-mirror: - series: focal - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - to: - - '14' - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '15' - - '16' - - '17' - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - #bluestore: False - #use-direct-io: False - storage: - osd-devices: '10G' - to: - - '18' - - '19' - - '20' - - ceph-rbd-mirror-b: - series: focal - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - to: - - '21' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-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' - - - - 'rabbitmq-server' - - 'cinder' - - - - 'keystone' - - 'cinder' - - - - 'keystone' - - 'glance' - - - - 'cinder' - - 'cinder-ceph' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance' - - 'ceph-mon' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'ceph-mon' - - 'ceph-rbd-mirror:ceph-local' - - - - 'ceph-mon' - - 'ceph-rbd-mirror-b:ceph-remote' - - - - 'ceph-mon-b:osd' - - 'ceph-osd-b:mon' - - - - 'ceph-mon-b' - - 'ceph-rbd-mirror-b:ceph-local' - - - - 'ceph-mon-b' - - 'ceph-rbd-mirror:ceph-remote' diff --git a/src/tests/bundles/focal-victoria-image-mirroring.yaml b/src/tests/bundles/focal-victoria-image-mirroring.yaml deleted file mode 100644 index 2d8d433..0000000 --- a/src/tests/bundles/focal-victoria-image-mirroring.yaml +++ /dev/null @@ -1,171 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &series focal - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - options: - rbd-mirroring-mode: image - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-replication-device - - ceph-mon-b:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 77a6e1f..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,167 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &series focal - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/focal-wallaby-image-mirroring.yaml b/src/tests/bundles/focal-wallaby-image-mirroring.yaml deleted file mode 100644 index b28a824..0000000 --- a/src/tests/bundles/focal-wallaby-image-mirroring.yaml +++ /dev/null @@ -1,171 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - options: - rbd-mirroring-mode: image - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-replication-device - - ceph-mon-b:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 8e82a18..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,167 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 345cc60..3460aae 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-xena +local_overlay_enabled: False + series: &series focal machines: @@ -14,14 +16,17 @@ 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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -29,85 +34,100 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None glance-api-version: 2 openstack-origin: *openstack-origin + channel: yoga/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: yoga/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror-b: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 5d2a4ed..2564d9c 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-yoga +local_overlay_enabled: False + series: &series focal machines: @@ -14,14 +16,17 @@ 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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -29,85 +34,100 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None glance-api-version: 2 openstack-origin: *openstack-origin + channel: yoga/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: yoga/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror-b: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin diff --git a/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml b/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml deleted file mode 100644 index 61413d3..0000000 --- a/src/tests/bundles/hirsute-wallaby-image-mirroring.yaml +++ /dev/null @@ -1,171 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - block-device: None - glance-api-version: 2 - openstack-origin: *openstack-origin - - cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph - num_units: 0 - options: - rbd-mirroring-mode: image - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client -- - cinder-ceph:ceph-replication-device - - ceph-mon-b:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index e2e10c5..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,166 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - '0': - constraints: "mem=3072M" - '1': - constraints: "mem=3072M" - '2': - constraints: "mem=3072M" - -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 - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - - cinder: - 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 - num_units: 0 - - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - - nova-compute: - charm: cs:~openstack-charmers-next/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - - ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - - ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - options: - source: *openstack-origin - bluestore: False - use-direct-io: False - osd-devices: /opt - - ceph-rbd-mirror-b: - series: *series - charm: ../../../ceph-rbd-mirror - num_units: 1 - options: - source: *openstack-origin - -relations: - -- - 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 - -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - cinder-mysql-router:db-router - - mysql-innodb-cluster:db-router - -- - rabbitmq-server - - cinder - -- - keystone - - cinder -- - keystone - - glance - -- - cinder - - cinder-ceph -- - cinder-ceph:ceph - - ceph-mon:client - -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp - -- - glance:image-service - - nova-compute:image-service -- - glance - - ceph-mon - -- - ceph-mon:osd - - ceph-osd:mon -- - ceph-mon - - ceph-rbd-mirror:ceph-local -- - ceph-mon - - ceph-rbd-mirror-b:ceph-remote - -- - ceph-mon-b:osd - - ceph-osd-b:mon -- - ceph-mon-b - - ceph-rbd-mirror-b:ceph-local -- - ceph-mon-b - - ceph-rbd-mirror:ceph-remote diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 40aa146..ddf2861 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series impish machines: @@ -14,14 +16,17 @@ 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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -29,84 +34,99 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None glance-api-version: 2 + channel: yoga/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: yoga/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror-b: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 17507a0..a3fd3f8 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series jammy machines: @@ -14,14 +16,17 @@ 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 mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -29,84 +34,99 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: block-device: None glance-api-version: 2 + channel: yoga/edge cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: ch:cinder-ceph num_units: 0 + channel: yoga/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin + channel: yoga/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin ceph-mon-b: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 source: *openstack-origin + channel: quincy/edge ceph-osd-b: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 + storage: + osd-devices: 'cinder,10G' options: source: *openstack-origin bluestore: False use-direct-io: False - osd-devices: /opt + osd-devices: '/dev/test-non-existent' + channel: quincy/edge ceph-rbd-mirror-b: series: *series - charm: ../../../ceph-rbd-mirror + charm: ../../../ceph-rbd-mirror.charm num_units: 1 options: source: *openstack-origin diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index bd170e7..117d828 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,38 +1,21 @@ charm_name: ceph-rbd-mirror smoke_bundles: -- focal-ussuri +- focal-xena gate_bundles: -- bionic-queens -- bionic-queens-e2e -- bionic-queens-e2e-lxd -- bionic-stein -- bionic-ussuri -- focal-ussuri -- focal-ussuri-image-mirroring -- focal-victoria -- focal-victoria-image-mirroring -- focal-wallaby -- focal-wallaby-image-mirroring - focal-xena - focal-xena-image-mirroring -- hirsute-wallaby -- hirsute-wallaby-image-mirroring - impish-xena - impish-xena-image-mirroring comment: | The e2e bundles are useful for development but adds no additional value to the functional tests. dev_bundles: -- bionic-rocky -- bionic-train -- bionic-train-image-mirroring -# This is a dev bundle because we hit https://bugs.launchpad.net/charm-ceph-rbd-mirror/+bug/1892201. -- bionic-ussuri-image-mirroring - focal-yoga - focal-yoga-image-mirroring - jammy-yoga - jammy-yoga-image-mirroring configure: +- zaza.openstack.charm_tests.glance.setup.add_cirros_image - zaza.openstack.charm_tests.glance.setup.add_lts_image tests: - zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorTest @@ -40,8 +23,6 @@ tests: - zaza.openstack.charm_tests.ceph.rbd_mirror.tests.CephRBDMirrorDisasterFailoverTest tests_options: force_deploy: - - hirsute-wallaby - - hirsute-wallaby-image-mirroring - impish-xena - impish-xena-image-mirroring - jammy-yoga diff --git a/test-requirements.txt b/test-requirements.txt index 208032f..a11a7d0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive +# Newer mock seems to have some syntax which is newer than python3.5 (e.g. +# f'{something}' +mock>=1.2,<4.0.0; python_version < '3.6' +mock>=1.2; python_version >= '3.6' + nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack @@ -46,3 +51,4 @@ pbr==5.6.0 # vault cryptography<3.4 # vault, keystone-saml-mellon lxml # keystone-saml-mellon hvac # vault, barbican-vault +psutil # cinder-lvm diff --git a/tox.ini b/tox.ini index faf6092..2d60b8a 100644 --- a/tox.ini +++ b/tox.ini @@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir} passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = {toxinidir}/pip.sh install {opts} {packages} +allowlist_externals = + charmcraft + bash + tox + rename.sh deps = -r{toxinidir}/requirements.txt [testenv:build] basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:build-reactive] +basepython = python3 commands = charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} @@ -86,6 +99,18 @@ deps = flake8==3.9.2 charm-tools==2.8.3 commands = flake8 {posargs} src unit_tests +[testenv:func-target] +# Hack to get functional tests working in the charmcraft +# world. We should fix this. +basepython = python3 +passenv = HOME TERM CS_* OS_* TEST_* +deps = -r{toxinidir}/src/test-requirements.txt +changedir = {toxinidir}/src +commands = + bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi" + tox --version + tox -e func-target {posargs} + [testenv:cover] # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini