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

osci.yaml

@@ -3,7 +3,9 @@
       - charm-unit-jobs
     check:
       jobs:
+      - hirsute-wallaby
       - groovy-victoria
+      - focal-wallaby
       - focal-victoria
       - focal-ussuri
       - bionic-ussuri
@@ -12,4 +14,4 @@
       - bionic-rocky
     vars:
       needs_charm_build: true
-      charm_build_name: octavia-dashboard
+      charm_build_name: octavia-dashboard

src/tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,136 @@
+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':
+  '7':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  octavia-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'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      neutron-security-groups: True
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+
+  octavia:
+    charm: cs:~openstack-charmers-next/octavia
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '7'
+
+  octavia-dashboard:
+     charm: ../../../octavia-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'octavia:shared-db'
+    - 'octavia-mysql-router:shared-db'
+  - - 'octavia-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'
+
+  - - 'keystone:identity-service'
+    - 'neutron-api:identity-service'
+
+  - - 'keystone:identity-service'
+    - 'octavia:identity-service'
+
+  - - 'keystone:identity-service'
+    - 'openstack-dashboard:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-api:amqp'
+
+  - - 'rabbitmq-server:amqp'
+    - 'octavia:amqp'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'
+
+  - - 'neutron-openvswitch:neutron-plugin'
+    - 'octavia:neutron-openvswitch'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'octavia-dashboard:dashboard'

src/tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,136 @@
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  octavia-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'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      neutron-security-groups: True
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+
+  octavia:
+    charm: cs:~openstack-charmers-next/octavia
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '7'
+
+  octavia-dashboard:
+     charm: ../../../octavia-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'octavia:shared-db'
+    - 'octavia-mysql-router:shared-db'
+  - - 'octavia-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'
+
+  - - 'keystone:identity-service'
+    - 'neutron-api:identity-service'
+
+  - - 'keystone:identity-service'
+    - 'octavia:identity-service'
+
+  - - 'keystone:identity-service'
+    - 'openstack-dashboard:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-api:amqp'
+
+  - - 'rabbitmq-server:amqp'
+    - 'octavia:amqp'
+
+  - - 'rabbitmq-server:amqp'
+    - 'neutron-openvswitch:amqp'
+
+  - - 'neutron-openvswitch:neutron-plugin'
+    - 'octavia:neutron-openvswitch'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'octavia-dashboard:dashboard'

src/tests/tests.yaml

@@ -1,24 +1,34 @@
 charm_name: octavia-dashboard
+
 gate_bundles:
 - groovy-victoria
+- focal-wallaby
 - focal-victoria
 - focal-ussuri
 - bionic-ussuri
 - bionic-train
 - bionic-stein
+
 smoke_bundles:
 - bionic-train
+
 dev_bundles:
+- hirsute-wallaby
 - bionic-rocky
+
 comment:
+
 target_deploy_status:
   octavia:
     workload-status: blocked
     workload-status-message: Awaiting
+
 configure:
 - zaza.charm_tests.noop.setup.basic_setup
+
 tests:
 - zaza.charm_tests.noop.tests.NoopTest
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby