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: I9c0411fa46abcf82fb0a7bf1a4882cbf8e00f9a9

osci.yaml

@@ -7,6 +7,7 @@
       - bionic-train
       - focal
       - groovy
+      - hirsute
     vars:
       needs_charm_build: true
-      charm_build_name: ovn-chassis
+      charm_build_name: ovn-chassis

src/tests/bundles/groovy.yaml

@@ -42,6 +42,7 @@ applications:
 
   nrpe:
     charm: cs:nrpe
+    series: focal
 
   ovn-central:
     charm: cs:~openstack-charmers-next/ovn-central

src/tests/bundles/hirsute.yaml

@@ -0,0 +1,89 @@
+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':
+  '7':
+  '8':
+
+applications:
+
+  vault-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'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '3'
+
+  nrpe:
+    charm: cs:nrpe
+    series: focal
+
+  ovn-central:
+    charm: cs:~openstack-charmers-next/ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  magpie:
+    charm: cs:~openstack-charmers-next/magpie
+    num_units: 2
+    to:
+      - '7'
+      - '8'
+
+  ovn-chassis:
+    charm: cs:~openstack-charmers-next/ovn-chassis
+
+relations:
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'
+
+  - - 'magpie:juju-info'
+    - 'ovn-chassis:juju-info'
+
+  - - 'ovn-chassis:ovsdb'
+    - 'ovn-central:ovsdb'
+
+  - - 'ovn-chassis:certificates'
+    - 'vault:certificates'
+
+  - - 'ovn-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
+  - - 'magpie:juju-info'
+    - 'nrpe:general-info'

src/tests/tests.yaml

@@ -1,11 +1,17 @@
 charm_name: ovn-chassis
+
 gate_bundles:
 - bionic-ussuri
 - bionic-train
 - focal
 - groovy
+
 smoke_bundles:
 - focal
+
+dev_bundles:
+- hirsute
+
 target_deploy_status:
   magpie:
     workload-status-message: icmp ok
@@ -21,13 +27,16 @@ target_deploy_status:
   nrpe:
     workload-status: blocked
     workload-status-message: "Nagios server not configured or related"
+
 # Note that full end to end tests are performed with OVN in the
 # neutron-api-plugin-ovn and octavia charm gates
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
+
 tests:
 - zaza.openstack.charm_tests.ovn.tests.OVNChassisDeferredRestartTest
 - zaza.openstack.charm_tests.ovn.tests.ChassisCharmOperationTest
+
 tests_options:
   force_deploy:
-    - groovy
+    - hirsute