Add focal-ussuri and bionic-ussuri bundle

This patch adds a focal-ussuri and bionic-ussuri bundles to the tests
for the charm.

Change-Id: Iae4483145d6b38c7cad4f4af1b56f2d9e79d00f9

src/metadata.yaml

@@ -17,6 +17,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 provides:
   domain-backend:

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,34 @@
+series: bionic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+
+applications:
+  percona-cluster:
+    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'
+  ldap-server:
+    charm: cs:~openstack-charmers/ldap-test-fixture
+    num_units: 1
+    to:
+    - '2'
+  keystone-ldap:
+    charm: ../../../keystone-ldap
+
+relations:
+- - 'keystone:domain-backend'
+  - 'keystone-ldap:domain-backend'
+- - 'keystone:shared-db'
+  - 'percona-cluster:shared-db'

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,58 @@
+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':
+
+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: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '3'
+
+  ldap-server:
+    charm: cs:~openstack-charmers/ldap-test-fixture
+    num_units: 1
+    to:
+    - '4'
+
+  keystone-ldap:
+    charm: ../../../keystone-ldap
+
+relations:
+  - - 'keystone:domain-backend'
+    - 'keystone-ldap:domain-backend'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'

src/tests/tests.yaml

@@ -1,21 +1,23 @@
 charm_name: keystone-ldap
 
 smoke_bundles:
-  - bionic_train
+  - bionic-train
 
 gate_bundles:
-  - xenial_mitaka
+  - xenial-mitaka
-  - xenial_ocata
+  - xenial-ocata
-  - xenial_pike
+  - xenial-pike
-  - xenial_queens
+  - xenial-queens
-  - bionic_queens
+  - bionic-queens
-  - bionic_rocky
+  - bionic-rocky
-  - bionic_stein
+  - bionic-stein
-  - bionic_train
+  - bionic-train
-  - trusty_mitaka
+  - bionic-ussuri
+  - focal-ussuri
+  - trusty-mitaka
 
 dev_bundles:
-  - bionic_train
+  - bionic-train
 
 target_deploy_status:
   keystone-ldap:
@@ -24,4 +26,8 @@ target_deploy_status:
 
 
 tests:
-  - zaza.openstack.charm_tests.keystone.tests.LdapTests
+  - zaza.openstack.charm_tests.keystone.tests.LdapTests
+
+tests_options:
+  force_deploy:
+    - focal-ussuri