Enable focal and ussuri as part of the gate tests

Add bionic-ussuri and focal-ussuri (with mysql8 support) bundles.

Change-Id: I9fc3e26408493a7969e19b1df3e46f432502b3d8

src/metadata.yaml

@@ -8,6 +8,7 @@ tags:
 series:
   - bionic
   - eoan
+  - focal
 subordinate: true
 requires:
   dashboard:

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,62 @@
+series: bionic
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - neutron-api:shared-db
+- - mysql:shared-db
+  - octavia:shared-db
+- - mysql:shared-db
+  - openstack-dashboard:shared-db
+- - 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
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  mysql:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      openstack-origin: cloud:bionic-ussuri
+      neutron-security-groups: True
+  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: cloud:bionic-ussuri
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  octavia-dashboard:
+     charm: ../../../octavia-dashboard
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,136 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+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/tests.yaml

@@ -1,5 +1,7 @@
 charm_name: octavia-dashboard
 gate_bundles:
+- focal-ussuri
+- bionic-ussuri
 - bionic-train
 - bionic-stein
 - bionic-rocky
@@ -16,3 +18,6 @@ configure:
 - zaza.charm_tests.noop.setup.basic_setup
 tests:
 - zaza.charm_tests.noop.tests.NoopTest
+tests_options:
+  force_deploy:
+    - focal-ussuri