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: I16b04aab3ad2438b4c2ecabb697d24c7725e316b
(cherry picked from commit 4cd4a1e37a)

osci.yaml

@@ -5,12 +5,21 @@
       jobs:
       - focal
       - groovy
+      - hirsute
       - full_model_ha-focal-full-ha
       - full_model_ha-groovy-full-ha
+      - full_model_ha-hirsute-full-ha
     vars:
       needs_charm_build: true
       charm_build_name: mysql-router
 
+- job:
+    name: full_model_ha-focal-full-ha
+    parent: func-target
+    dependencies:
+      - focal
+    vars:
+      tox_extra_args: full_model_ha:focal-full-ha
 - job:
     name: full_model_ha-groovy-full-ha
     parent: func-target
@@ -19,9 +28,9 @@
     vars:
       tox_extra_args: full_model_ha:groovy-full-ha
 - job:
-    name: full_model_ha-focal-full-ha
+    name: full_model_ha-hirsute-full-ha
     parent: func-target
     dependencies:
       - focal
     vars:
-      tox_extra_args: full_model_ha:focal-full-ha
+      tox_extra_args: full_model_ha:hirsute-full-ha

src/tests/bundles/hirsute-full-ha.yaml

@@ -0,0 +1 @@
+hirsute-full.yaml

src/tests/bundles/hirsute-full.yaml

@@ -0,0 +1,159 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series hirsute
+
+applications:
+  keystone-mysql-router:
+    charm: ../../../mysql-router
+  nova-mysql-router:
+    charm: ../../../mysql-router
+  glance-mysql-router:
+    charm: ../../../mysql-router
+  neutron-mysql-router:
+    charm: ../../../mysql-router
+  placement-mysql-router:
+    charm: ../../../mysql-router
+  vault-mysql-router:
+    charm: ../../../mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+  ovn-central:
+    charm: cs:~openstack-charmers-next/ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+  neutron-api-plugin-ovn:
+    charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    series: *series
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+  ovn-chassis:
+    charm: cs:~openstack-charmers-next/ovn-chassis
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+  memcached:
+    charm: cs:memcached
+    num_units: 1
+    series: bionic
+relations:
+  - - neutron-api:amqp
+    - rabbitmq-server:amqp
+  - - neutron-api:neutron-api
+    - nova-cloud-controller:neutron-api
+  - - neutron-api:identity-service
+    - keystone:identity-service
+  - - nova-cloud-controller:amqp
+    - rabbitmq-server:amqp
+  - - nova-compute:amqp
+    - rabbitmq-server:amqp
+  - - nova-cloud-controller:identity-service
+    - keystone:identity-service
+  - - nova-cloud-controller:cloud-compute
+    - nova-compute:cloud-compute
+  - - glance:identity-service
+    - keystone:identity-service
+  - - glance:amqp
+    - rabbitmq-server:amqp
+  - - nova-compute:image-service
+    - glance:image-service
+  - - nova-cloud-controller:image-service
+    - glance:image-service
+  - - placement:identity-service
+    - keystone:identity-service
+  - - placement:placement
+    - nova-cloud-controller:placement
+  - - neutron-api-plugin-ovn:neutron-plugin
+    - neutron-api:neutron-plugin-api-subordinate
+  - - ovn-central:certificates
+    - vault:certificates
+  - - ovn-central:ovsdb-cms
+    - neutron-api-plugin-ovn:ovsdb-cms
+  - - neutron-api:certificates
+    - vault:certificates
+  - - ovn-chassis:nova-compute
+    - nova-compute:neutron-plugin
+  - - ovn-chassis:certificates
+    - vault:certificates
+  - - ovn-chassis:ovsdb
+    - ovn-central:ovsdb
+  - - vault:certificates
+    - neutron-api-plugin-ovn:certificates
+  - - vault:certificates
+    - glance:certificates
+  - - vault:certificates
+    - keystone:certificates
+  - - vault:certificates
+    - nova-cloud-controller:certificates
+  - - vault:certificates
+    - placement:certificates
+  - - memcached:cache
+    - nova-cloud-controller:memcache
+  - - keystone:shared-db
+    - keystone-mysql-router:shared-db
+  - - glance:shared-db
+    - glance-mysql-router:shared-db
+  - - nova-cloud-controller:shared-db
+    - nova-mysql-router:shared-db
+  - - neutron-api:shared-db
+    - neutron-mysql-router:shared-db
+  - - placement:shared-db
+    - placement-mysql-router:shared-db
+  - - vault:shared-db
+    - vault-mysql-router:shared-db
+  - - keystone-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - nova-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - glance-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - neutron-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - placement-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - vault-mysql-router:db-router
+    - mysql-innodb-cluster:db-router

src/tests/bundles/hirsute.yaml

@@ -0,0 +1,30 @@
+series: hirsute
+applications:
+  keystone-mysql-router:
+    series: groovy
+    charm: ../../../mysql-router
+  vault-mysql-router:
+    series: groovy
+    charm: ../../../mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+relations:
+  - - vault:certificates
+    - mysql-innodb-cluster:certificates
+  - - vault:certificates
+    - keystone:certificates
+  - - keystone:shared-db
+    - keystone-mysql-router:shared-db
+  - - vault:shared-db
+    - vault-mysql-router:shared-db
+  - - keystone-mysql-router:db-router
+    - mysql-innodb-cluster:db-router
+  - - vault-mysql-router:db-router
+    - mysql-innodb-cluster:db-router

src/tests/bundles/overlays/hirsute-full-ha.yaml.j2

@@ -0,0 +1 @@
+full-ha.yaml.j2

src/tests/tests.yaml

@@ -1,4 +1,5 @@
 charm_name: mysql-router
+
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user
@@ -9,6 +10,7 @@ configure:
     - zaza.openstack.charm_tests.nova.setup.create_flavors
     - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
     - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+
 tests:
 - zaza.openstack.charm_tests.mysql.tests.MySQLRouterTests
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
@@ -16,19 +18,27 @@ tests:
     - zaza.openstack.charm_tests.mysql.tests.MySQLRouterTests
     - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
     - zaza.openstack.charm_tests.hacluster.tests.HaclusterScaleBackAndForthTest
+
 gate_bundles:
 - full_model_ha: focal-full-ha
 - groovy
 - full_model_ha: groovy-full-ha
+
+dev_bundles:
+- hirsute
+- full_model_ha: hirsute-full-ha
+
 smoke_bundles:
 - focal
+
 tests_options:
   hacluster:
     principle-app-name: keystone
     hacluster-charm-name: hacluster
   force_deploy:
-   - groovy
-   - groovy-full-ha
+   - hirsute
+   - hirsute-full-ha
+
 target_deploy_status:
   neutron-api-plugin-ovn:
     workload-status: waiting