Test bundles for focal-wallaby and hirsute-wallaby

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

hisute-wallaby test is disabled (moved to dev) due to [1].

[1] canonical/layer-basic#194

Change-Id: I34b3a2f1f2509a287023659f9172931b345e569d

src/tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,62 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+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':
+    series: bionic
+
+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
+      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
+      expel-timeout: 20
+    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
+    series: bionic
+    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/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,62 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+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':
+    series: bionic
+
+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
+      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
+      expel-timeout: 20
+    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
+    series: bionic
+    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,7 +1,7 @@
 charm_name: keystone-ldap
 
 smoke_bundles:
-  - bionic-train
+  - focal-ussuri
 
 gate_bundles:
   - xenial-mitaka
@@ -11,6 +11,7 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
+  - focal-wallaby
   - groovy-victoria
 
 dev_bundles:
@@ -19,6 +20,7 @@ dev_bundles:
   - xenial-pike
   - xenial-queens
   - bionic-rocky
+  - hirsute-wallaby
 
 target_deploy_status:
   keystone-ldap:
@@ -31,4 +33,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby