From 59674b090d739e9a388d72e2ca980d66548db2f0 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 4 Mar 2021 10:30:14 +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. Sync libraries. 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 Change-Id: I9534bd7092d2c2abe9e2a85703d4cf9b8f763d82 --- osci.yaml | 4 +- tests/bundles/focal-wallaby.yaml | 164 +++++++++++++++++++++++++++++ tests/bundles/hirsute-wallaby.yaml | 164 +++++++++++++++++++++++++++++ tests/tests.yaml | 9 +- 4 files changed, 339 insertions(+), 2 deletions(-) create mode 100644 tests/bundles/focal-wallaby.yaml create mode 100644 tests/bundles/hirsute-wallaby.yaml diff --git a/osci.yaml b/osci.yaml index 5bd353e..3c7ed0f 100644 --- a/osci.yaml +++ b/osci.yaml @@ -12,4 +12,6 @@ - bionic-train - bionic-ussuri - focal-victoria - - groovy-victoria \ No newline at end of file + - focal-wallaby + - groovy-victoria + #- hirsute-wallaby diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml new file mode 100644 index 0000000..579b0b3 --- /dev/null +++ b/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,164 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '4' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + monitor-count: '3' + source: *openstack-origin + to: + - '5' + - '6' + - '7' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + options: + osd-devices: '/dev/test-non-existent' + source: *openstack-origin + to: + - '8' + - '9' + - '10' + + cinder: + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + block-device: 'None' + glance-api-version: '2' + openstack-origin: *openstack-origin + to: + - '11' + + cinder-backup: + charm: ../../../cinder-backup + options: + ceph-osd-replication-count: 3 + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + options: + ceph-osd-replication-count: 3 + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + to: + - '12' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + to: + - '13' + +relations: + + - - 'cinder-backup:ceph' + - 'ceph-mon:client' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'cinder:storage-backend' + - 'cinder-ceph:storage-backend' + + - - 'cinder:backup-backend' + - 'cinder-backup:backup-backend' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'glance:image-service' + - 'nova-compute:image-service' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-compute:ceph-access' + - 'cinder-ceph:ceph-access' + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 0000000..f971c17 --- /dev/null +++ b/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,164 @@ +variables: + openstack-origin: &openstack-origin distro + +series: hirsute + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + cinder-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '4' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + monitor-count: '3' + source: *openstack-origin + to: + - '5' + - '6' + - '7' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + options: + osd-devices: '/dev/test-non-existent' + source: *openstack-origin + to: + - '8' + - '9' + - '10' + + cinder: + charm: cs:~openstack-charmers-next/cinder + num_units: 1 + options: + block-device: 'None' + glance-api-version: '2' + openstack-origin: *openstack-origin + to: + - '11' + + cinder-backup: + charm: ../../../cinder-backup + options: + ceph-osd-replication-count: 3 + + cinder-ceph: + charm: cs:~openstack-charmers-next/cinder-ceph + options: + ceph-osd-replication-count: 3 + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + to: + - '12' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + to: + - '13' + +relations: + + - - 'cinder-backup:ceph' + - 'ceph-mon:client' + + - - 'cinder-ceph:ceph' + - 'ceph-mon:client' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'cinder:storage-backend' + - 'cinder-ceph:storage-backend' + + - - 'cinder:backup-backend' + - 'cinder-backup:backup-backend' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:shared-db' + - 'cinder-mysql-router:shared-db' + - - 'cinder-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'cinder:identity-service' + - 'keystone:identity-service' + + - - 'cinder:amqp' + - 'rabbitmq-server:amqp' + + - - 'glance:image-service' + - 'nova-compute:image-service' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-compute:ceph-access' + - 'cinder-ceph:ceph-access' + + - - 'nova-compute:amqp' + - 'rabbitmq-server:amqp' diff --git a/tests/tests.yaml b/tests/tests.yaml index a7ea0c7..53b7d24 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,6 +1,8 @@ charm_name: cinder-backup + smoke_bundles: - bionic-train + gate_bundles: - xenial-mitaka - bionic-queens @@ -8,7 +10,9 @@ gate_bundles: - bionic-train - bionic-ussuri - focal-victoria + - focal-wallaby - groovy-victoria + dev_bundles: - trusty-mitaka # fails often because of lp:1877076 - xenial-ocata @@ -16,8 +20,11 @@ dev_bundles: - xenial-queens - bionic-rocky - focal-ussuri # disabled because of lp:1891626 + - hirsute-wallaby + tests: - zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest + tests_options: force_deploy: - - groovy-victoria + - hirsute-wallaby