From f219232b3a43f83267c67e316430a5d1e7a0e48c Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 3 Mar 2021 20:13:04 +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 charm-helpers Also pin prometheus2 charm in bundles to focal series as it does not support groovy or hirsute. Change-Id: I75602720f8e30be647aa8a1227d565c692ff8170 Co-authored-by: Aurelien Lourot --- tests/bundles/focal-wallaby.yaml | 235 ++++++++++++++++++++++++++++ tests/bundles/groovy-victoria.yaml | 2 + tests/bundles/hirsute-wallaby.yaml | 237 +++++++++++++++++++++++++++++ tests/tests.yaml | 11 +- 4 files changed, 484 insertions(+), 1 deletion(-) 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 00000000..21ce4e6f --- /dev/null +++ b/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,235 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + '14': + '15': + '16': + + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: '10G' + options: + source: *openstack-origin + osd-devices: '/dev/test-non-existent' + to: + - '3' + - '4' + - '5' + + ceph-mon: + charm: ../../../ceph-mon + num_units: 3 + options: + source: *openstack-origin + monitor-count: '3' + to: + - '6' + - '7' + - '8' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '9' + + keystone: + expose: True + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '10' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + openstack-origin: *openstack-origin + libvirt-image-backend: rbd + to: + - '11' + + glance: + expose: True + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + cinder: + expose: True + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + block-device: 'None' + glance-api-version: '2' + openstack-origin: *openstack-origin + to: + - '13' + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + + nova-cloud-controller: + expose: True + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '14' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '15' + + prometheus2: +# Pin prometheus2 charm version Bug #1891942 + charm: cs:prometheus2-18 + num_units: 1 + to: + - '16' + +relations: + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-compute:ceph' + - 'ceph-mon:client' + + - - nova-compute:ceph-access + - cinder-ceph:ceph-access + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'glance:ceph' + - 'ceph-mon:client' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'cinder:image-service' + - 'glance:image-service' + + - - 'cinder-ceph:storage-backend' + - 'cinder:storage-backend' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:identity-service' + - 'keystone:identity-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement' + - 'keystone' + + - - 'placement' + - 'nova-cloud-controller' + + - - 'ceph-mon:prometheus' + - 'prometheus2:target' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 49b42437..5321a42c 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -26,6 +26,7 @@ machines: '14': '15': '16': + series: focal applications: @@ -145,6 +146,7 @@ applications: # Pin prometheus2 charm version Bug #1891942 charm: cs:prometheus2-18 num_units: 1 + series: focal to: - '16' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 00000000..17ee2e0a --- /dev/null +++ b/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,237 @@ +variables: + openstack-origin: &openstack-origin distro + +series: hirsute + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + '14': + '15': + '16': + series: focal + + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: '10G' + options: + source: *openstack-origin + osd-devices: '/dev/test-non-existent' + to: + - '3' + - '4' + - '5' + + ceph-mon: + charm: ../../../ceph-mon + num_units: 3 + options: + source: *openstack-origin + monitor-count: '3' + to: + - '6' + - '7' + - '8' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '9' + + keystone: + expose: True + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '10' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + openstack-origin: *openstack-origin + libvirt-image-backend: rbd + to: + - '11' + + glance: + expose: True + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + cinder: + expose: True + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + block-device: 'None' + glance-api-version: '2' + openstack-origin: *openstack-origin + to: + - '13' + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + + nova-cloud-controller: + expose: True + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '14' + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '15' + + prometheus2: +# Pin prometheus2 charm version Bug #1891942 + charm: cs:prometheus2-18 + num_units: 1 + series: focal + to: + - '16' + +relations: + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-compute:ceph' + - 'ceph-mon:client' + + - - nova-compute:ceph-access + - cinder-ceph:ceph-access + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'glance:ceph' + - 'ceph-mon:client' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'cinder:image-service' + - 'glance:image-service' + + - - 'cinder-ceph:storage-backend' + - 'cinder:storage-backend' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:identity-service' + - 'keystone:identity-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement' + - 'keystone' + + - - 'placement' + - 'nova-cloud-controller' + + - - 'ceph-mon:prometheus' + - 'prometheus2:target' diff --git a/tests/tests.yaml b/tests/tests.yaml index de2b01c0..9b41ba55 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,6 +1,8 @@ charm_name: ceph-mon + gate_bundles: - groovy-victoria + - focal-wallaby - focal-victoria - focal-ussuri-ec - focal-ussuri @@ -10,16 +12,21 @@ gate_bundles: - bionic-stein - bionic-queens - xenial-mitaka + dev_bundles: - trusty-mitaka - xenial-ocata - xenial-pike - xenial-queens - bionic-rocky + - hirsute-wallaby + smoke_bundles: - bionic-train + configure: - zaza.openstack.charm_tests.glance.setup.add_lts_image + tests: - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes - zaza.openstack.charm_tests.ceph.tests.CephLowLevelTest @@ -27,6 +34,8 @@ tests: - zaza.openstack.charm_tests.ceph.tests.CephTest - zaza.openstack.charm_tests.ceph.osd.tests.SecurityTest - zaza.openstack.charm_tests.ceph.tests.CephPrometheusTest + tests_options: force_deploy: - - groovy-victoria + - trusty-mitaka + - hirsute-wallaby