Enable bionic/stein functional tests

Add missing default ``upgrade-charm`` reactive handler.

Change-Id: I14ed4c93af4d6ab794bf2d6f651c42e3efabec86
This commit is contained in:
Frode Nordahl 2019-04-03 12:37:31 +02:00
parent 26480ed59e
commit c8ab9efa2d
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
5 changed files with 125 additions and 2 deletions

View File

@ -23,7 +23,8 @@ charms_openstack.bus.discover()
charm.use_defaults(
'charm.installed',
'config.changed',
'update-status')
'update-status',
'upgrade-charm')
@reactive.when('dashboard.available')

View File

@ -0,0 +1,64 @@
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-stein
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:
openstack-origin: cloud:bionic-stein
neutron-security-groups: True
neutron-openvswitch:
series: bionic
charm: cs:~openstack-charmers-next/neutron-openvswitch
num_units: 0
octavia:
series: bionic
charm: cs:~openstack-charmers-next/octavia
num_units: 1
options:
openstack-origin: cloud:bionic-stein
openstack-dashboard:
series: bionic
charm: cs:~openstack-charmers-next/openstack-dashboard
num_units: 1
options:
openstack-origin: cloud:bionic-stein
octavia-dashboard:
series: bionic
charm: ../../../octavia-dashboard
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1

View File

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

View File

@ -1,12 +1,15 @@
charm_name: octavia-dashboard
gate_bundles:
- bionic-rocky
- bionic-stein
smoke_bundles:
- bionic-rocky
comment: |
Disable ``disco-stein`` bundle pending resolution of LP: #1824112
Disable ``cosmic-rocky`` bundle pending SRU of ``octavia-dashboard`` package.
dev_bundles:
- cosmic-rocky
- disco-stein
target_deploy_status:
octavia:
workload-status: blocked

View File

@ -28,7 +28,8 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
defaults = [
'charm.installed',
'config.changed',
'update-status']
'update-status',
'upgrade-charm']
hook_set = {
'when': {
'dashboard_available': (