Test bundles for focal-wallaby and hirsute-wallaby

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

Libraries sync

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

osci.yaml

@@ -12,7 +12,9 @@
       - bionic-ussuri
       - focal-ussuri
       - focal-victoria
+      - focal-wallaby
       - groovy-victoria
+      - hirsute-wallaby
 
 - job:
     name: checklist-work-required-xenial-mitaka

tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,69 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: focal
+
+comment:
+  - 'machines section to decide order of deployment. database sooner = faster'
+  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
+
+machines:
+  '0':
+    constraints: virt-type=kvm mem=3072M
+  '1':
+    constraints: virt-type=kvm mem=3072M
+  '2':
+    constraints: virt-type=kvm mem=3072M
+  '3':
+    constraints: virt-type=kvm
+  '4':
+    constraints: virt-type=kvm mem=3072M
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-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'
+
+  openstack-dashboard:
+    charm: ../../../openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'

tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,69 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+comment:
+  - 'machines section to decide order of deployment. database sooner = faster'
+  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
+
+machines:
+  '0':
+    constraints: virt-type=kvm mem=3072M
+  '1':
+    constraints: virt-type=kvm mem=3072M
+  '2':
+    constraints: virt-type=kvm mem=3072M
+  '3':
+    constraints: virt-type=kvm
+  '4':
+    constraints: virt-type=kvm mem=3072M
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-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'
+
+  openstack-dashboard:
+    charm: ../../../openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'

tests/tests.yaml

@@ -4,7 +4,8 @@ comment:
   - ''
 
 smoke_bundles:
-  - bionic-stein
+  - focal-ussuri
+
 gate_bundles:
   - bionic-train-gr:
     - vault: bionic-vault
@@ -19,8 +20,12 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
+  - focal-wallaby
   - groovy-victoria
 
+dev_bundles:
+  - hirsute-wallaby
+
 configure:
   - vault:
     - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
@@ -44,11 +49,13 @@ tests:
   - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
   - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
   - zaza.openstack.charm_tests.openstack_dashboard.tests.SecurityTests
+
 tests_options:
   policyd:
     service: openstack-dashboard
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby
+
 target_deploy_status:
   vault:
     workload-status: blocked