From c16a74d1905b17441c34e338e1cb78e4a3485b4a Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 17 May 2022 19:13:20 +0100 Subject: [PATCH] Migrate charm charmhub for stable/wallaby - start from stable/wallaby branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/wallaby for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 20.04 amd64 - Run on 20.04 amd64, s390x, ppc64el, arm64 - remove .coveragerc - Pin tempest for python<3.8 Change-Id: I188b6741405b205f916a8d7afe56c9f62c14bb40 --- .coveragerc | 6 - .gitignore | 1 + .gitreview | 2 +- .zuul.yaml | 4 +- build-requirements.txt | 7 + charm-helpers-hooks.yaml | 2 +- charmcraft.yaml | 31 +++ metadata.yaml | 5 - osci.yaml | 30 +-- rename.sh | 13 ++ test-requirements.txt | 8 +- tests/bundles/bionic-queens.yaml | 179 ----------------- tests/bundles/bionic-rocky.yaml | 198 ------------------- tests/bundles/bionic-stein.yaml | 198 ------------------- tests/bundles/bionic-train.yaml | 213 -------------------- tests/bundles/bionic-ussuri.yaml | 214 -------------------- tests/bundles/focal-ussuri.yaml | 303 ---------------------------- tests/bundles/focal-victoria.yaml | 65 ++++-- tests/bundles/focal-wallaby.yaml | 65 ++++-- tests/bundles/focal-xena.yaml | 305 ----------------------------- tests/bundles/groovy-victoria.yaml | 303 ---------------------------- tests/bundles/hirsute-wallaby.yaml | 305 ----------------------------- tests/bundles/impish-xena.yaml | 305 ----------------------------- tests/bundles/trusty-mitaka.yaml | 106 ---------- tests/bundles/xenial-mitaka.yaml | 93 --------- tests/bundles/xenial-ocata.yaml | 203 ------------------- tests/bundles/xenial-pike.yaml | 198 ------------------- tests/bundles/xenial-queens.yaml | 198 ------------------- tests/tests.yaml | 28 +-- tox.ini | 17 +- 30 files changed, 174 insertions(+), 3431 deletions(-) delete mode 100644 .coveragerc create mode 100644 build-requirements.txt create mode 100644 charmcraft.yaml create mode 100755 rename.sh delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-ussuri.yaml delete mode 100644 tests/bundles/focal-xena.yaml delete mode 100644 tests/bundles/groovy-victoria.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml delete mode 100644 tests/bundles/impish-xena.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/.coveragerc b/.coveragerc deleted file mode 100644 index ed08ec9..0000000 --- a/.coveragerc +++ /dev/null @@ -1,6 +0,0 @@ -[report] -# Regexes for lines to exclude from consideration -exclude_lines = - if __name__ == .__main__.: -include= - hooks/ceilometer_* diff --git a/.gitignore b/.gitignore index 0d08763..56a9873 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ tags trusty .stestr func-results.json +*.charm diff --git a/.gitreview b/.gitreview index 811ee38..1ac0803 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-ceilometer-agent.git -defaultbranch=stable/21.10 +defaultbranch=stable/wallaby diff --git a/.zuul.yaml b/.zuul.yaml index 34184f1..8cd637f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - python35-charm-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-wallaby-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 7c5605c..c3ccde9 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/wallaby destination: charmhelpers include: - core diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..b48ba59 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,31 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - charmhelpers/* + - files/* + - hooks/* + - lib/* + - templates/* + - config.yaml + - copyright + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - build-on: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 + run-on: + - name: ubuntu + channel: "20.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index c88091c..71873a2 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,12 +17,7 @@ tags: - telemetry - misc series: -- xenial -- bionic - focal -- groovy -- hirsute -- impish provides: nrpe-external-master: interface: nrpe-external-master diff --git a/osci.yaml b/osci.yaml index 4d7b979..7a0ab1f 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,27 +1,9 @@ - project: templates: - - charm-unit-jobs - check: - jobs: - - xenial-mitaka_ceilometer-agent - - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - - focal-xena: - voting: false - - groovy-victoria - - hirsute-wallaby - - impish-xena: - voting: false - -- job: - name: xenial-mitaka_ceilometer-agent - parent: func-target - dependencies: - - bionic-ussuri + - charm-unit-jobs-py38 + - charm-victoria-functional-jobs + - charm-wallaby-functional-jobs vars: - tox_extra_args: mitaka:xenial-mitaka + needs_charm_build: true + charm_build_name: ceilometer-agent + 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..42df531 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/wallaby#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#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 deleted file mode 100644 index 85a6118..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,179 +0,0 @@ -series: bionic - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index db46136..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:bionic-rocky - -series: bionic - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index a7d4f37..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:bionic-stein - -series: bionic - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 6ecddc8..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,213 +0,0 @@ -options: - source: &source cloud:bionic-train - -series: bionic - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - 17: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *source - to: - - '17' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'placement:shared-db' - - 'percona-cluster:shared-db' -- - 'placement:identity-service' - - 'keystone:identity-service' -- - 'placement:placement' - - 'nova-cloud-controller:placement' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index e7d4b77..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,214 +0,0 @@ -options: - source: &source cloud:bionic-ussuri - -series: bionic - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - 17: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *source - to: - - '17' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'placement:shared-db' - - 'percona-cluster:shared-db' -- - 'placement:identity-service' - - 'keystone:identity-service' -- - 'placement:placement' - - 'nova-cloud-controller:placement' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 5013de0..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,303 +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': - # machine for memcached; doesn't have a focal+ version yet. - series: bionic - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-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' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # hold at bionic as no focal version of the charm yet - series: bionic - to: - - '4' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '15' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 8e8a44c..fb41547 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-victoria @@ -37,20 +39,26 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -58,17 +66,19 @@ applications: - '0' - '1' - '2' + channel: 8.0/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: 3.8/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # hold at bionic as no focal version of the charm yet series: bionic @@ -76,7 +86,7 @@ applications: - '4' ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 options: source: *openstack-origin @@ -86,9 +96,10 @@ applications: - '5' - '6' - '7' + channel: pacific/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -96,42 +107,47 @@ applications: - '8' - '9' - '10' + channel: pacific/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '11' + channel: wallaby/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: wallaby/edge nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin network-manager: Neutron to: - '13' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: wallaby/edge neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -140,21 +156,24 @@ applications: neutron-security-groups: true to: - '15' + channel: wallaby/edge neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '16' + channel: wallaby/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: wallaby/edge ceilometer: - charm: cs:~openstack-charmers/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin @@ -163,25 +182,29 @@ applications: polling-batch-size: 0 to: - '17' + channel: wallaby/edge gnocchi: - charm: cs:~openstack-charmers/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '18' + channel: wallaby/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '19' + channel: wallaby/edge ceilometer-agent: + charm: ../../ceilometer-agent.charm options: polling-interval: 10 enable-all-pollsters: true diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 2609440..e6d1fb1 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-wallaby @@ -37,20 +39,26 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -58,17 +66,19 @@ applications: - '0' - '1' - '2' + channel: 8.0/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: 3.8/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # hold at bionic as no focal version of the charm yet series: bionic @@ -76,7 +86,7 @@ applications: - '4' ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 options: source: *openstack-origin @@ -86,9 +96,10 @@ applications: - '5' - '6' - '7' + channel: pacific/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: source: *openstack-origin @@ -96,42 +107,47 @@ applications: - '8' - '9' - '10' + channel: pacific/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '11' + channel: wallaby/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '12' + channel: wallaby/edge nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin network-manager: Neutron to: - '13' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: wallaby/edge neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -140,21 +156,24 @@ applications: neutron-security-groups: true to: - '15' + channel: wallaby/edge neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '16' + channel: wallaby/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: wallaby/edge ceilometer: - charm: cs:~openstack-charmers/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin @@ -163,25 +182,29 @@ applications: polling-batch-size: 0 to: - '17' + channel: wallaby/edge gnocchi: - charm: cs:~openstack-charmers/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '18' + channel: wallaby/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 constraints: mem=1G options: openstack-origin: *openstack-origin to: - '19' + channel: wallaby/edge ceilometer-agent: + charm: ../../ceilometer-agent.charm options: polling-interval: 10 # NOTE(lourot): we normally set this to `true` in other bundles in order diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml deleted file mode 100644 index 11d6b8e..0000000 --- a/tests/bundles/focal-xena.yaml +++ /dev/null @@ -1,305 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-xena - -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': - # machine for memcached; doesn't have a focal+ version yet. - series: bionic - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-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' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # hold at bionic as no focal version of the charm yet - series: bionic - to: - - '4' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '15' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - - ceilometer-agent: - options: - polling-interval: 10 - # NOTE(lourot): we normally set this to `true` in other bundles in order - # to validate more metrics but this is broken on Wallaby. See lp:1938884 - enable-all-pollsters: false - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 45c9040..0000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,303 +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': - # machine for memcached; doesn't have a focal+ version yet. - series: bionic - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-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' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # hold at bionic as no focal/groovy version of the charm yet - series: bionic - to: - - '4' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '15' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 164c2de..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,305 +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': - # machine for memcached; doesn't have a focal+ version yet. - series: bionic - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-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' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # hold at bionic as no focal/groovy version of the charm yet - series: bionic - to: - - '4' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '15' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - - ceilometer-agent: - options: - polling-interval: 10 - # NOTE(lourot): we normally set this to `true` in other bundles in order - # to validate more metrics but this is broken on Wallaby. See lp:1938884 - enable-all-pollsters: false - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml deleted file mode 100644 index 9047627..0000000 --- a/tests/bundles/impish-xena.yaml +++ /dev/null @@ -1,305 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: impist - -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': - # machine for memcached; doesn't have a focal+ version yet. - series: bionic - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - gnocchi-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-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' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # hold at bionic as no focal/groovy version of the charm yet - series: bionic - to: - - '4' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '15' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - - ceilometer-agent: - options: - polling-interval: 10 - # NOTE(lourot): we normally set this to `true` in other bundles in order - # to validate more metrics but this is broken on Wallaby. See lp:1938884 - enable-all-pollsters: false - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml deleted file mode 100644 index 3ee92ea..0000000 --- a/tests/bundles/trusty-mitaka.yaml +++ /dev/null @@ -1,106 +0,0 @@ -options: - source: &source cloud:trusty-mitaka - -series: trusty - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: - constraints: mem=4096M - 6: {} - 7: {} - -applications: - percona-cluster: - charm: cs:trusty/percona-cluster - num_units: 1 - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - mongodb: - charm: cs:trusty/mongodb-53 - num_units: 1 - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '4' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - to: - - '5' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '6' - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - to: - - '7' - ceilometer-agent: {} - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index ad576ba..0000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,93 +0,0 @@ -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: - constraints: mem=4096M - 6: {} - 7: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - mongodb: - charm: cs:xenial/mongodb - num_units: 1 - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - to: - - '4' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - to: - - '5' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - to: - - '6' - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - to: - - '7' - ceilometer-agent: {} - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index d750800..0000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,203 +0,0 @@ -options: - source: &source cloud:xenial-ocata -series: xenial -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - 17: {} -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - mongodb: - num_units: 1 - charm: cs:xenial/mongodb - to: - - '17' - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'ceilometer:shared-db' - - 'mongodb:database' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index 9a9c763..0000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:xenial-pike - -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index a796b4b..0000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,198 +0,0 @@ -options: - source: &source cloud:xenial-queens - -series: xenial - -machines: - 0: {} - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: - constraints: mem=4096M - 12: - constraints: mem=4096M cores=4 - 13: {} - 14: {} - 15: {} - 16: {} - -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '1' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '2' - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *source - to: - - '3' - - '4' - - '5' - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - source: *source - to: - - '6' - - '7' - - '8' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - to: - - '9' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *source - to: - - '10' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: *source - network-manager: Neutron - to: - - '11' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *source - to: - - '12' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: *source - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '13' - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *source - bridge-mappings: physnet1:br-ex - to: - - '14' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - ceilometer: - charm: cs:~openstack-charmers/ceilometer - num_units: 1 - options: - openstack-origin: *source - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '15' - gnocchi: - charm: cs:~openstack-charmers/gnocchi - num_units: 1 - options: - openstack-origin: *source - to: - - '16' - ceilometer-agent: - options: - polling-interval: 10 - enable-all-pollsters: true - -relations: -- - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' -- - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' -- - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' -- - 'ceilometer:metric-service' - - 'gnocchi:metric-service' -- - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' -- - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' -- - 'glance:identity-service' - - 'keystone:identity-service' -- - 'glance:shared-db' - - 'percona-cluster:shared-db' -- - 'glance:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-compute:image-service' - - 'glance:image-service' -- - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' -- - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' -- - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' -- - 'nova-cloud-controller:image-service' - - 'glance:image-service' -- - 'ceph-mon:osd' - - 'ceph-osd:mon' -- - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' -- - 'gnocchi:storage-ceph' - - 'ceph-mon:client' -- - 'gnocchi:coordinator-memcached' - - 'memcached:cache' -- - 'gnocchi:identity-service' - - 'keystone:identity-service' -- - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' -- - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' -- - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/tests.yaml b/tests/tests.yaml index fc8ae16..6325639 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,8 +1,6 @@ charm_name: ceilometer-agent configure: - - mitaka: - - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.keystone.setup.add_demo_user @@ -11,31 +9,14 @@ configure: - zaza.openstack.charm_tests.nova.setup.manage_ssh_key gate_bundles: - - mitaka: xenial-mitaka - - bionic-queens - - bionic-train - - bionic-ussuri - - focal-ussuri - focal-victoria - focal-wallaby - - focal-xena - - groovy-victoria - - hirsute-wallaby - - impish-xena -dev_bundles: - - mitaka: trusty-mitaka - - xenial-ocata - - xenial-pike - - xenial-queens - - bionic-rocky +dev_bundles: [] -smoke_bundles: - - focal-ussuri +smoke_bundles: [] tests: - - mitaka: - - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest - zaza.openstack.charm_tests.ceilometer_agent.tests.CeilometerAgentTest @@ -45,7 +26,4 @@ target_deploy_status: workload-status-message: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi" tests_options: - force_deploy: - - trusty-mitaka - - hirsute-wallaby - - impish-xena + force_deploy: [] diff --git a/tox.ini b/tox.ini index ba4fd5b..81fd249 100644 --- a/tox.ini +++ b/tox.ini @@ -37,10 +37,20 @@ 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:build] +basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + [testenv:py35] basepython = python3.5 deps = -r{toxinidir}/requirements.txt @@ -61,6 +71,11 @@ basepython = python3.8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py39] +basepython = python3.9 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:py3] basepython = python3 deps = -r{toxinidir}/requirements.txt