Add focal-ussuri and bionic-ussuri bundle

This patch adds a focal-ussuri and bionic-ussuri bundles to the tests
for the charm.  Note that this requires a modified zaza (to use the
force_deploy option).

Change-Id: I68574e63552ae796254bfa4929342459951cab21

tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,36 @@
+series: bionic
+
+comment:
+  - 'machines section to decide order of deployment. database sooner = faster'
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+
+relations:
+  - ["keystone:shared-db", "mysql:shared-db"]
+  - ["glance:shared-db", "mysql:shared-db"]
+  - ["glance:identity-service", "keystone:identity-service"]
+
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+      - '0'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+      - '1'
+  glance:
+    charm: ../../../glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '2'

tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,44 @@
+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':
+
+relations:
+  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
+  - ["glance:shared-db", "glance-mysql-router:shared-db"]
+  - ["glance:identity-service", "keystone:identity-service"]
+  - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+
+applications:
+  glance-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
+    to:
+      - '0'
+      - '1'
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    to:
+      - '3'
+  glance:
+    charm: ../../../glance
+    num_units: 1
+    to:
+      - '4'

tests/tests.yaml

@@ -18,8 +18,10 @@ gate_bundles:
   - bionic-rocky
   - bionic-stein
   - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
 dev_bundles:
-  - bionic-train
+  - focal-ussuri
 
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
@@ -31,3 +33,5 @@ tests:
 tests_options:
   policyd:
     service: glance
+  force_deploy:
+    - focal-ussuri