Add bionic-ussuri and focal-ussuri test bundles

Also switch the smoke bundle to focal-ussuri as that will be the LTS on
focal.

Change-Id: I91ae66a5903c23c663243dfd10270d04325e5e39
Closes-Bug: #1879684

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,41 @@
+series: bionic
+options:
+  source: &source cloud:bionic-ussuri
+services:
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      default-share-backend: generic
+      openstack-origin: *source
+  manila-generic:
+    charm: ../../../manila-generic
+    options:
+      driver-handles-share-servers: False
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *source
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *source
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *source
+
+relations:
+  - - manila:manila-plugin
+    - manila-generic
+  - - manila
+    - rabbitmq-server
+  - - manila
+    - keystone
+  - - keystone
+    - percona-cluster
+  - - manila
+    - percona-cluster

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,85 @@
+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':
+
+services:
+
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-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'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      default-share-backend: generic
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  manila-generic:
+    charm: ../../../manila-generic
+    options:
+      driver-handles-share-servers: False
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+relations:
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:manila-plugin'
+    - 'manila-generic'
+
+  - - 'manila'
+    - 'rabbitmq-server'
+
+  - - 'manila'
+    - 'keystone'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'

src/tests/tests.yaml

@@ -3,11 +3,13 @@ gate_bundles:
   - xenial-pike
   - xenial-queens
   - bionic-queens
+  - bionic-rocky
   - bionic-stein
   - bionic-train
-  - bionic-rocky
+  - bionic-ussuri
+  - focal-ussuri
 smoke_bundles:
-  - bionic-queens
+  - focal-ussuri
 target_deploy_status: {}
 tests:
   - zaza.openstack.charm_tests.manila.tests.ManilaTests