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] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: I51d16d692b1456f157b54d35eec892c14946ea4d

osci.yaml

@@ -4,4 +4,4 @@
       - charm-functional-jobs
     vars:
       needs_charm_build: true
-      charm_build_name: designate-bind
+      charm_build_name: designate-bind

src/tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,98 @@
+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':
+    series: bionic
+  '7':
+
+applications:
+
+  designate-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: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '3'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+    - '4'
+
+  designate:
+    charm: cs:~openstack-charmers-next/designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.mojotest.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  memcached:
+    series: bionic
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    to:
+    - '6'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    to:
+    - '7'
+
+relations:
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'

src/tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,98 @@
+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':
+    series: bionic
+  '7':
+
+applications:
+
+  designate-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: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '3'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+    - '4'
+
+  designate:
+    charm: cs:~openstack-charmers-next/designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.mojotest.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  memcached:
+    series: bionic
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    to:
+    - '6'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    to:
+    - '7'
+
+relations:
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'

src/tests/tests.yaml

@@ -11,6 +11,7 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
+  - focal-wallaby
   - groovy-victoria
 
 dev_bundles:
@@ -19,10 +20,11 @@ dev_bundles:
   - xenial-pike
   - xenial-queens
   - bionic-rocky
+  - hirsute-wallaby
 
 tests:
   - zaza.openstack.charm_tests.designate.tests.DesignateTests
 
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby