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:
parent
4d66c30ef4
commit
d9c6147ce5
|
@ -7,6 +7,7 @@ tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- bionic
|
- bionic
|
||||||
|
- cosmic
|
||||||
subordinate: true
|
subordinate: true
|
||||||
requires:
|
requires:
|
||||||
dashboard:
|
dashboard:
|
||||||
|
|
|
@ -20,8 +20,8 @@ relations:
|
||||||
- octavia:amqp
|
- octavia:amqp
|
||||||
- - rabbitmq-server:amqp
|
- - rabbitmq-server:amqp
|
||||||
- neutron-openvswitch:amqp
|
- neutron-openvswitch:amqp
|
||||||
- - neutron-openvswitch:juju-info
|
- - neutron-openvswitch:neutron-plugin
|
||||||
- octavia:juju-info
|
- octavia:neutron-openvswitch
|
||||||
- - openstack-dashboard:dashboard-plugin
|
- - openstack-dashboard:dashboard-plugin
|
||||||
- octavia-dashboard:dashboard
|
- octavia-dashboard:dashboard
|
||||||
applications:
|
applications:
|
||||||
|
@ -55,7 +55,7 @@ applications:
|
||||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
charm: cs:~openstack-charmers-next/openstack-dashboard
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: cloud:bionic-rocky/proposed
|
openstack-origin: cloud:bionic-rocky
|
||||||
octavia-dashboard:
|
octavia-dashboard:
|
||||||
series: bionic
|
series: bionic
|
||||||
charm: ../../../octavia-dashboard
|
charm: ../../../octavia-dashboard
|
||||||
|
|
|
@ -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
|
|
@ -1,9 +1,16 @@
|
||||||
charm_name: octavia-dashboard
|
charm_name: octavia-dashboard
|
||||||
gate_bundles:
|
gate_bundles:
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
- cosmic-rocky
|
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- bionic-rocky
|
- 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:
|
configure:
|
||||||
- zaza.charm_tests.noop.setup.basic_setup
|
- zaza.charm_tests.noop.setup.basic_setup
|
||||||
tests:
|
tests:
|
||||||
|
|
Loading…
Reference in New Issue