Add focal and ussuri test bundles

The focal-ussuri test is disabled for gate (it's in dev bundles) due to
the upstream bug [1] in os-brick connecting to ceph-octopus in focal.
Bug [2] is for tracking the issue against the charms.

Related-Bug: #1865754 [1]
Related-Bug: #1891626 [2]
Closes-Bug: #1879684

func-test-pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/390
Change-Id: I64c4ef1d7f5c183b7f04e089e126eda52136d7fc

metadata.yaml

@@ -1,6 +1,6 @@
 name: cinder-backup
 summary: Cinder-backup integration for OpenStack Block Storage
-maintainer: Edward Hope-Morley <opentastic@gmail.com>
+maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
   Cinder is the block storage service for the Openstack project.
   .

tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,82 @@
+series: bionic
+relations:
+- - cinder-backup:ceph
+  - ceph-mon:client
+- - cinder-ceph:ceph
+  - ceph-mon:client
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - cinder:storage-backend
+  - cinder-ceph:storage-backend
+- - cinder:backup-backend
+  - cinder-backup:backup-backend
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - cinder:shared-db
+  - percona-cluster:shared-db
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - glance:image-service
+  - nova-compute:image-service
+- - glance:identity-service
+  - keystone:identity-service
+- - glance:shared-db
+  - percona-cluster:shared-db
+- - nova-compute:ceph-access
+  - cinder-ceph:ceph-access
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      innodb-buffer-pool-size: 256M
+      max-connections: 1000
+      source: cloud:bionic-train
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-train
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      source: cloud:bionic-train
+  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: cloud:bionic-train
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: 'None'
+      glance-api-version: '2'
+      openstack-origin: cloud:bionic-train
+  cinder-backup:
+    charm: ../../../cinder-backup
+    series: bionic
+    options:
+      ceph-osd-replication-count: 3
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+    options:
+      ceph-osd-replication-count: 3
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1

tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,164 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-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'

tests/tests.yaml

@@ -1,6 +1,6 @@
 charm_name: cinder-backup
 smoke_bundles:
-- bionic-train
+  - bionic-train
 gate_bundles:
   - trusty-mitaka
   - xenial-mitaka
@@ -11,7 +11,9 @@ gate_bundles:
   - bionic-rocky
   - bionic-stein
   - bionic-train
+  - bionic-ussuri
 dev_bundles:
   - bionic-train
+  - focal-ussuri
 tests:
   - zaza.openstack.charm_tests.cinder_backup.tests.CinderBackupTest