Test bundles for focal-wallaby and hirsute-wallaby

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

Sync libraries

hisute-wallaby test is disabled (moved to dev) due to [1] as bundle may
reference a reactive charm.

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: Id837ffa7bdc3ed4ed739824785d658522dc9e328

tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,68 @@
+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':
+  '5':
+  '6':
+
+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
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+      token-expiration: 300
+    to:
+    - '3'
+    - '4'
+    - '5'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+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'

tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,68 @@
+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':
+  '5':
+  '6':
+
+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
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+      token-expiration: 300
+    to:
+    - '3'
+    - '4'
+    - '5'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+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'

tests/tests.yaml

@@ -1,8 +1,11 @@
 charm_name: keystone
+
 smoke_bundles:
-- bionic-train
+- focal-ussuri
+
 gate_bundles:
 - groovy-victoria
+- focal-wallaby
 - focal-victoria
 - focal-ussuri
 - bionic-ussuri
@@ -10,25 +13,31 @@ gate_bundles:
 - bionic-stein
 - bionic-queens
 - xenial-mitaka
+
 dev_bundles:
 - trusty-mitaka
 - xenial-ocata
 - xenial-pike
 - xenial-queens
 - bionic-rocky
+- hirsute-wallaby
+
 comment: |
   the glance configure job validates operation of identity-service relation.
   The policyd test is generic and validates the policy.d overrides work
+
 configure:
 - zaza.openstack.charm_tests.glance.setup.add_lts_image
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+
 tests:
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 - zaza.openstack.charm_tests.keystone.tests.CharmOperationTest
 - zaza.openstack.charm_tests.keystone.tests.SecurityTests
 - zaza.openstack.charm_tests.policyd.tests.KeystoneTests
+
 tests_options:
   policyd:
     service: keystone
   force_deploy:
-    - groovy-victoria
+    - hisute-wallaby