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

osci.yaml

@@ -6,6 +6,7 @@
       - bionic-basic
       - focal-basic
       - groovy-basic
+      - hirsute-basic
     vars:
       needs_charm_build: true
       charm_build_name: pacemaker-remote
@@ -33,4 +34,10 @@
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: groovy-basic
+      tox_extra_args: groovy-basic
+- job:
+    name: hirsute-basic
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: hirsute-basic

src/tests/bundles/hirsute-basic.yaml

@@ -0,0 +1,34 @@
+series: hirsute
+
+applications:
+
+  api:
+    charm: cs:ubuntu
+    num_units: 3
+
+  hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+  compute:
+    charm: cs:ubuntu
+    num_units: 1
+
+  pacemaker-remote:
+    charm: pacemaker-remote
+    options:
+      enable-stonith: False
+      enable-resources: False
+
+relations:
+
+  - - 'compute:juju-info'
+    - 'pacemaker-remote:juju-info'
+
+  - - 'api:juju-info'
+    - 'hacluster:juju-info'
+
+  - - 'hacluster:pacemaker-remote'
+    - 'pacemaker-remote:pacemaker-remote'

src/tests/tests.yaml

@@ -1,14 +1,22 @@
 charm_name: pacemaker-remote
+
 tests:
   - zaza.openstack.charm_tests.pacemaker_remote.tests.PacemakerRemoteTest
+
 configure:
   - zaza.charm_tests.noop.setup.basic_setup
+
 gate_bundles:
   - bionic-basic
   - focal-basic
   - groovy-basic
+
 smoke_bundles:
-  - bionic-basic
+  - focal-basic
+
+dev_bundles:
+  - hirsute-basic
+
 target_deploy_status:
   # NOTE(lourot): cs:ubuntu has now an empty status message when ready:
   api:
@@ -17,6 +25,7 @@ target_deploy_status:
   compute:
     workload-status: active
     workload-status-message: ''
+
 tests_options:
   force_deploy:
-    - groovy-basic
+    - hirsute-basic