From 340c1be9df1d292dbf17964b4a41712a66345077 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 21 Jun 2022 19:23:59 +0100 Subject: [PATCH] Charmhub migration for stable/train (bionic-only) This is the main patch for the migration of the stable/21.10 charm to charmhub for the stable/train branch (train track on charmhub). This patch initially supports bionic from queens to train, and does not support ussuri. It supports upgrades from bionic-queens to bionic-train (with each intermediate step needed). Crucially it does NOT set a default openstack-origin, which means installing train/stable without specifying the openstack-origin will result in a bionic-queens installation. This is intentional as the branch covers queens to train. Change-Id: I9d9504bbaac55da2c099cdc5efb52f5f85e9c9b3 --- .gitignore | 1 + .gitreview | 2 +- .zuul.yaml | 4 +- build-requirements.txt | 7 ++ charm-helpers-hooks.yaml | 2 +- charmcraft.yaml | 30 ++++++ metadata.yaml | 5 - osci.yaml | 24 ++--- rename.sh | 13 +++ test-requirements.txt | 8 +- tests/bundles/bionic-queens.yaml | 31 ++++-- tests/bundles/bionic-rocky.yaml | 31 ++++-- tests/bundles/bionic-stein.yaml | 31 ++++-- tests/bundles/bionic-train.yaml | 31 ++++-- tests/bundles/bionic-ussuri.yaml | 82 --------------- tests/bundles/focal-ussuri.yaml | 164 ----------------------------- tests/bundles/focal-victoria.yaml | 164 ----------------------------- tests/bundles/focal-wallaby.yaml | 164 ----------------------------- tests/bundles/groovy-victoria.yaml | 164 ----------------------------- tests/bundles/hirsute-wallaby.yaml | 164 ----------------------------- tests/bundles/trusty-mitaka.yaml | 83 --------------- tests/bundles/xenial-mitaka.yaml | 77 -------------- tests/bundles/xenial-ocata.yaml | 83 --------------- tests/bundles/xenial-pike.yaml | 83 --------------- tests/bundles/xenial-queens.yaml | 83 --------------- tests/tests.yaml | 18 +--- tox.ini | 24 +++-- 27 files changed, 173 insertions(+), 1400 deletions(-) create mode 100644 build-requirements.txt create mode 100644 charmcraft.yaml create mode 100755 rename.sh delete mode 100644 tests/bundles/bionic-ussuri.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/groovy-victoria.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml delete mode 100644 tests/bundles/trusty-mitaka.yaml delete mode 100644 tests/bundles/xenial-mitaka.yaml delete mode 100644 tests/bundles/xenial-ocata.yaml delete mode 100644 tests/bundles/xenial-pike.yaml delete mode 100644 tests/bundles/xenial-queens.yaml diff --git a/.gitignore b/.gitignore index c94de0a..b4ede3f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bin *.pyc func-results.json .stestr +*.charm diff --git a/.gitreview b/.gitreview index b56c14b..75173ee 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-cinder-backup.git -defaultbranch=stable/21.10 +defaultbranch=stable/train diff --git a/.zuul.yaml b/.zuul.yaml index b3037e9..15b984f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,5 @@ - project: templates: - - python35-charm-jobs - - openstack-python3-ussuri-jobs + # note that this requires tox-py36 and tox-py37 targets + - openstack-python3-train-jobs - openstack-cover-jobs 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/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 889721b..19f67c5 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers@stable/21.10 +repo: https://github.com/juju/charm-helpers@stable/train destination: hooks/charmhelpers include: - core diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..1caf478 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,30 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/.* + - config.yaml + - copyright + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - build-on: + - name: ubuntu + channel: "18.04" + architectures: + - amd64 + run-on: + - name: ubuntu + channel: "18.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index 63c3bb0..89534d9 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -8,12 +8,7 @@ description: | tags: - miscellaneous series: -- xenial - bionic -- focal -- groovy -- hirsute -- impish subordinate: true provides: backup-backend: diff --git a/osci.yaml b/osci.yaml index 3c7ed0f..57ca5e1 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,17 +1,11 @@ - project: templates: - - charm-unit-jobs - # Revert this to the project-template when trusty is actually - # removed from the charm-functional-jobs template - # - charm-functional-jobs - check: - jobs: - - xenial-mitaka - - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-victoria - - focal-wallaby - - groovy-victoria - #- hirsute-wallaby + - charm-unit-jobs-py36 + - charm-queens-functional-jobs + - charm-rocky-functional-jobs + - charm-stein-functional-jobs + - charm-train-functional-jobs + vars: + needs_charm_build: true + charm_build_name: cinder-backup + 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/test-requirements.txt b/test-requirements.txt index 0a7e94a..456b15c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,7 @@ # requirements. They are intertwined. Also, Zaza itself should specify # all of its own requirements and if it doesn't, fix it there. # +pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0. cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 @@ -37,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6' coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/train#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/train#egg=zaza.openstack # Needed for charm-glance: -git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' +git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8' +tempest<31.0.0;python_version<'3.8' and python_version>='3.6' tempest<24.0.0;python_version<'3.6' croniter # needed for charm-rabbitmq-server unit tests diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index c0ad629..f9e8db3 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - cinder-backup:ceph @@ -30,48 +32,57 @@ relations: - rabbitmq-server:amqp applications: percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 + channel: train/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.6/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' + channel: nautilus/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + channel: nautilus/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' + channel: train/edge cinder-backup: - charm: ../../../cinder-backup + charm: ../../cinder-backup.charm series: bionic options: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: train/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 + channel: train/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 + channel: train/edge diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 8201b23..a55a26c 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - cinder-backup:ceph @@ -30,54 +32,63 @@ relations: - rabbitmq-server:amqp applications: percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 source: cloud:bionic-rocky + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky + channel: train/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.6/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: cloud:bionic-rocky + channel: nautilus/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: cloud:bionic-rocky + channel: nautilus/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-rocky + channel: train/edge cinder-backup: - charm: ../../../cinder-backup + charm: ../../cinder-backup.charm series: bionic options: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: train/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 + channel: train/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 + channel: train/edge diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index c9eb39f..e87da0f 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - cinder-backup:ceph @@ -30,54 +32,63 @@ relations: - rabbitmq-server:amqp applications: percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 source: cloud:bionic-stein + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: cloud:bionic-stein + channel: train/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.6/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: cloud:bionic-stein + channel: nautilus/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: cloud:bionic-stein + channel: nautilus/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-stein + channel: train/edge cinder-backup: - charm: ../../../cinder-backup + charm: ../../cinder-backup.charm series: bionic options: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: train/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 + channel: train/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 + channel: train/edge diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 55bc256..014c81a 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - cinder-backup:ceph @@ -30,53 +32,62 @@ relations: - rabbitmq-server:amqp applications: percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 source: cloud:bionic-train + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: cloud:bionic-train + channel: train/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.6/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:bionic-train + channel: nautilus/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: cloud:bionic-train + channel: nautilus/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-train + channel: train/edge cinder-backup: - charm: ../../../cinder-backup + charm: ../../cinder-backup.charm series: bionic options: ceph-osd-replication-count: 3 cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: ceph-osd-replication-count: 3 + channel: train/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 + channel: train/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 + channel: train/edge diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 55bc256..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,82 +0,0 @@ -series: bionic -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:bionic-train - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: cloud:bionic-train - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:bionic-train - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:bionic-train - cinder-backup: - charm: ../../../cinder-backup - series: bionic - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index b6857e1..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,164 +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': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - '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' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 43ecb08..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,164 +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': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - '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' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 5b884ad..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,164 +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': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - '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' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 84fe9ea..0000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,164 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -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': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - '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' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 5e7a3ae..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,164 +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': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '4' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '5' - - '6' - - '7' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: *openstack-origin - to: - - '11' - - cinder-backup: - charm: ../../../cinder-backup - options: - ceph-osd-replication-count: 3 - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '12' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '13' - -relations: - - - - 'cinder-backup:ceph' - - 'ceph-mon:client' - - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - - 'cinder:backup-backend' - - 'cinder-backup:backup-backend' - - - - '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' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:image-service' - - 'nova-compute:image-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml deleted file mode 100644 index 4f01232..0000000 --- a/tests/bundles/trusty-mitaka.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: trusty -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:trusty/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:trusty-mitaka - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:trusty-mitaka - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:trusty-mitaka - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:trusty-mitaka - cinder-backup: - charm: ../../../cinder-backup - series: trusty - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index a93fc6e..0000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,77 +0,0 @@ -series: xenial -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - cinder-backup: - charm: ../../../cinder-backup - series: xenial - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index dfbc554..0000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: xenial -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:xenial-ocata - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:xenial-ocata - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:xenial-ocata - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:xenial-ocata - cinder-backup: - charm: ../../../cinder-backup - series: xenial - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index c24038e..0000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: xenial -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:xenial-pike - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:xenial-pike - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:xenial-pike - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:xenial-pike - cinder-backup: - charm: ../../../cinder-backup - series: xenial - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index f2692cd..0000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: xenial -relations: -- - cinder-backup:ceph - - ceph-mon:client -- - cinder-ceph:ceph - - ceph-mon:client -- - ceph-osd:mon - - ceph-mon:osd -- - cinder:storage-backend - - cinder-ceph:storage-backend -- - cinder:backup-backend - - cinder-backup:backup-backend -- - keystone:shared-db - - percona-cluster:shared-db -- - cinder:shared-db - - percona-cluster:shared-db -- - cinder:identity-service - - keystone:identity-service -- - cinder:amqp - - rabbitmq-server:amqp -- - glance:image-service - - nova-compute:image-service -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - nova-compute:ceph-access - - cinder-ceph:ceph-access -- - nova-compute:amqp - - rabbitmq-server:amqp -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - source: cloud:xenial-queens - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - monitor-count: '3' - auth-supported: 'none' - source: cloud:xenial-queens - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - osd-devices: '/dev/test-non-existent' - source: cloud:xenial-queens - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - block-device: 'None' - glance-api-version: '2' - openstack-origin: cloud:xenial-queens - cinder-backup: - charm: ../../../cinder-backup - series: xenial - options: - ceph-osd-replication-count: 3 - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - ceph-osd-replication-count: 3 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 diff --git a/tests/tests.yaml b/tests/tests.yaml index 53b7d24..1f85261 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,27 +4,15 @@ smoke_bundles: - bionic-train gate_bundles: - - xenial-mitaka - bionic-queens + - bionic-rocky - bionic-stein - bionic-train - - bionic-ussuri - - focal-victoria - - focal-wallaby - - groovy-victoria -dev_bundles: - - trusty-mitaka # fails often because of lp:1877076 - - xenial-ocata - - xenial-pike - - xenial-queens - - bionic-rocky - - focal-ussuri # disabled because of lp:1891626 - - hirsute-wallaby +dev_bundles: [] tests: - zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest tests_options: - force_deploy: - - hirsute-wallaby + force_deploy: [] diff --git a/tox.ini b/tox.ini index ba4fd5b..2e130b7 100644 --- a/tox.ini +++ b/tox.ini @@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir} install_command = {toxinidir}/pip.sh install {opts} {packages} commands = stestr run --slowest {posargs} -allowlist_externals = juju +allowlist_externals = + charmcraft + rename.sh passenv = HOME TERM CS_* OS_* TEST_* deps = -r{toxinidir}/test-requirements.txt -[testenv:py35] -basepython = python3.5 +[testenv:build] +basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:py3] +basepython = python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -50,21 +60,21 @@ deps = -r{toxinidir}/requirements.txt basepython = python3.6 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} [testenv:py37] basepython = python3.7 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} [testenv:py38] basepython = python3.8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + -[testenv:py3] -basepython = python3 -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt [testenv:pep8] basepython = python3