Update test definitions and bundles

The workload message for Octavia on successful deploy has
changed, reflect that change in the functional test
definitions.

Add missing `cosmic` series support and `cosmic-rocky` bundle.

Change-Id: I55c8dc3b2f853ff32fbbb7df30b2926f8f0717f2
This commit is contained in:
Frode Nordahl 2018-12-10 19:51:19 +01:00
parent 4d66c30ef4
commit d9c6147ce5
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
4 changed files with 66 additions and 4 deletions

View File

@ -7,6 +7,7 @@ tags:
- openstack
series:
- bionic
- cosmic
subordinate: true
requires:
dashboard:

View File

@ -20,8 +20,8 @@ relations:
- octavia:amqp
- - rabbitmq-server:amqp
- neutron-openvswitch:amqp
- - neutron-openvswitch:juju-info
- octavia:juju-info
- - neutron-openvswitch:neutron-plugin
- octavia:neutron-openvswitch
- - openstack-dashboard:dashboard-plugin
- octavia-dashboard:dashboard
applications:
@ -55,7 +55,7 @@ applications:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-rocky/proposed
openstack-origin: cloud:bionic-rocky
octavia-dashboard:
series: bionic
charm: ../../../octavia-dashboard

View File

@ -0,0 +1,54 @@
series: cosmic
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
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:
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
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
octavia-dashboard:
series: cosmic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

View File

@ -1,9 +1,16 @@
charm_name: octavia-dashboard
gate_bundles:
- bionic-rocky
- cosmic-rocky
smoke_bundles:
- bionic-rocky
comment: |
Disable ``cosmic-rocky`` bundle pending SRU of ``octavia-dashboard`` package.
dev_bundles:
- cosmic-rocky
target_deploy_status:
octavia:
workload-status: blocked
workload-status-message: Awaiting
configure:
- zaza.charm_tests.noop.setup.basic_setup
tests: