From dd5f8e6bc2fb81859e0d5066570a7c89667c264a Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 3 Mar 2021 19:34:26 +0000 Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. hisute-wallaby test is disabled (moved to dev) due to [1] as bundle may reference a reactive charm. [1] https://github.com/juju-solutions/layer-basic/issues/194 Sync charmhelpers. Change-Id: Ie73cc2223e51b741272c32e4d4a9d4a21949e37c --- tests/bundles/focal-wallaby.yaml | 241 +++++++++++++++++++++++++++++ tests/bundles/hirsute-wallaby.yaml | 241 +++++++++++++++++++++++++++++ tests/tests.yaml | 14 +- 3 files changed, 494 insertions(+), 2 deletions(-) create mode 100644 tests/bundles/focal-wallaby.yaml create mode 100644 tests/bundles/hirsute-wallaby.yaml diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml new file mode 100644 index 0000000..ed8db18 --- /dev/null +++ b/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,241 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + # machine for memcached; doesn't have a focal version yet. + series: bionic + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + '14': + '15': + '16': + '17': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + gnocchi-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/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-next/ceph-osd + num_units: 3 + options: + source: *openstack-origin + storage: + osd-devices: 'cinder,10G' + to: + - '5' + - '6' + - '7' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + to: + - '8' + - '9' + - '10' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '11' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '13' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '14' + + ceilometer: + charm: cs:~openstack-charmers-next/ceilometer + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '15' + + gnocchi: + charm: cs:~openstack-charmers-next/gnocchi + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '16' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + to: + - '17' + + ceilometer-agent: {} + +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' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 0000000..f6c0f32 --- /dev/null +++ b/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,241 @@ +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/groovy version yet. + series: bionic + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + '14': + '15': + '16': + '17': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + gnocchi-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/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-next/ceph-osd + num_units: 3 + options: + source: *openstack-origin + storage: + osd-devices: 'cinder,10G' + to: + - '5' + - '6' + - '7' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + to: + - '8' + - '9' + - '10' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '11' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '13' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '14' + + ceilometer: + charm: cs:~openstack-charmers-next/ceilometer + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '15' + + gnocchi: + charm: cs:~openstack-charmers-next/gnocchi + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '16' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + to: + - '17' + + ceilometer-agent: {} + +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' diff --git a/tests/tests.yaml b/tests/tests.yaml index 6c0b22a..581ccdc 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,6 +1,8 @@ charm_name: ceilometer-agent + configure: - zaza.openstack.charm_tests.ceilometer.setup.basic_setup + gate_bundles: - xenial-mitaka - bionic-queens @@ -9,21 +11,29 @@ gate_bundles: - bionic-ussuri - focal-ussuri - focal-victoria + - focal-wallaby - groovy-victoria + dev_bundles: - trusty-mitaka - xenial-ocata - xenial-pike - xenial-queens - bionic-rocky + - hirsute-wallaby + smoke_bundles: - - bionic-train + - focal-ussuri + tests: - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest + target_deploy_status: ceilometer: workload-status: blocked workload-status-message: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi" + tests_options: force_deploy: - - groovy-victoria + - trusty-mitaka + - hirsute-wallaby