Merge "Add focal-ussuri and bionic-ussuri bundle"

tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,32 @@
+series: bionic
+
+machines:
+  '0':
+  '1':
+  '2':
+  '3':
+
+relations:
+  - ['keystone:shared-db', 'percona-cluster:shared-db']
+  - ['hacluster:ha', 'keystone:ha']
+
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+      - '0'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      openstack-origin: cloud:bionic-ussuri
+      token-expiration: 60
+    to:
+      - '1'
+      - '2'
+      - '3'
+  hacluster:
+    charm: ../../../hacluster
+    subordinate-to:
+      - keystone

tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,54 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      token-expiration: 60
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  hacluster:
+    charm: ../../../hacluster
+    subordinate-to:
+      - keystone
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'hacluster:ha'
+    - 'keystone:ha'
+  - - "keystone-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"

tests/tests.yaml

@@ -12,11 +12,17 @@ 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
 
 tests:
   - zaza.openstack.charm_tests.hacluster.tests.HaclusterTest
+
+tests_options:
+  force_deploy:
+    - focal-ussuri