openstack
/
charm-manila-ganesha
Code Issues Proposed changes

Add focal-victoria to the test gate 

Also fix units/machines assignments in test bundles.

Change-Id: I33186df8ff4893c2dde4b1f3fef9e6fd1fd72d6e
Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/421
This commit is contained in:
Aurelien Lourot 2020-08-28 14:05:06 +02:00
parent 64ee2a393b
commit 84c39a9e8e
4 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tests/bundles/focal-ussuri.yaml
View File

@ -24,14 +24,15 @@ machines:
'12':
'13':
'14':
constraints: mem=8G
'15':
constraints: mem=8G
'16':
constraints: mem=8G
'17':
'18':
'19':
'20':
'21':
services:
@ -76,6 +77,7 @@ services:
to:
- '4'
- '5'
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
@ -85,9 +87,9 @@ services:
storage:
osd-devices: 'cinder,10G'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
@ -95,8 +97,8 @@ services:
options:
source: *openstack-origin
to:
- '9'
- '10'
- '11'
manila:
charm: cs:~openstack-charmers-next/manila
@ -106,7 +108,7 @@ services:
share-protocols: NFS
openstack-origin: *openstack-origin
to:
- '11'
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
@ -115,7 +117,7 @@ services:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '12'
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
@ -123,7 +125,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '13'
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
@ -135,8 +137,8 @@ services:
migration-auth-type: ssh
openstack-origin: *openstack-origin
to:
- '14'
- '15'
- '16'
glance:
charm: cs:~openstack-charmers-next/glance
@ -144,7 +146,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '16'
- '17'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
@ -156,7 +158,7 @@ services:
neutron-security-groups: true
openstack-origin: *openstack-origin
to:
- '17'
- '18'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
@ -168,7 +170,7 @@ services:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '18'
- '19'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
@ -176,7 +178,7 @@ services:
options:
source: *openstack-origin
to:
- '19'
- '20'
keystone:
charm: cs:~openstack-charmers-next/keystone
@ -184,7 +186,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '20'
- '21'
relations:

26
src/tests/bundles/focal-victoria.yaml
View File

@ -24,14 +24,15 @@ machines:
'12':
'13':
'14':
constraints: mem=8G
'15':
constraints: mem=8G
'16':
constraints: mem=8G
'17':
'18':
'19':
'20':
'21':
services:
@ -76,6 +77,7 @@ services:
to:
- '4'
- '5'
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
@ -85,9 +87,9 @@ services:
storage:
osd-devices: 'cinder,10G'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
@ -95,8 +97,8 @@ services:
options:
source: *openstack-origin
to:
- '9'
- '10'
- '11'
manila:
charm: cs:~openstack-charmers-next/manila
@ -106,7 +108,7 @@ services:
share-protocols: NFS
openstack-origin: *openstack-origin
to:
- '11'
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
@ -115,7 +117,7 @@ services:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '12'
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
@ -123,7 +125,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '13'
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
@ -135,8 +137,8 @@ services:
migration-auth-type: ssh
openstack-origin: *openstack-origin
to:
- '14'
- '15'
- '16'
glance:
charm: cs:~openstack-charmers-next/glance
@ -144,7 +146,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '16'
- '17'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
@ -156,7 +158,7 @@ services:
neutron-security-groups: true
openstack-origin: *openstack-origin
to:
- '17'
- '18'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
@ -168,7 +170,7 @@ services:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '18'
- '19'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
@ -176,7 +178,7 @@ services:
options:
source: *openstack-origin
to:
- '19'
- '20'
keystone:
charm: cs:~openstack-charmers-next/keystone
@ -184,7 +186,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '20'
- '21'
relations:

26
src/tests/bundles/groovy-victoria.yaml
View File

@ -24,14 +24,15 @@ machines:
'12':
'13':
'14':
constraints: mem=8G
'15':
constraints: mem=8G
'16':
constraints: mem=8G
'17':
'18':
'19':
'20':
'21':
services:
@ -76,6 +77,7 @@ services:
to:
- '4'
- '5'
- '6'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
@ -85,9 +87,9 @@ services:
storage:
osd-devices: 'cinder,10G'
to:
- '6'
- '7'
- '8'
- '9'
ceph-fs:
charm: cs:~openstack-charmers-next/ceph-fs
@ -95,8 +97,8 @@ services:
options:
source: *openstack-origin
to:
- '9'
- '10'
- '11'
manila:
charm: cs:~openstack-charmers-next/manila
@ -106,7 +108,7 @@ services:
share-protocols: NFS
openstack-origin: *openstack-origin
to:
- '11'
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
@ -115,7 +117,7 @@ services:
network-manager: Neutron
openstack-origin: *openstack-origin
to:
- '12'
- '13'
placement:
charm: cs:~openstack-charmers-next/placement
@ -123,7 +125,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '13'
- '14'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
@ -135,8 +137,8 @@ services:
migration-auth-type: ssh
openstack-origin: *openstack-origin
to:
- '14'
- '15'
- '16'
glance:
charm: cs:~openstack-charmers-next/glance
@ -144,7 +146,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '16'
- '17'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
@ -156,7 +158,7 @@ services:
neutron-security-groups: true
openstack-origin: *openstack-origin
to:
- '17'
- '18'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
@ -168,7 +170,7 @@ services:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
to:
- '18'
- '19'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
@ -176,7 +178,7 @@ services:
options:
source: *openstack-origin
to:
- '19'
- '20'
keystone:
charm: cs:~openstack-charmers-next/keystone
@ -184,7 +186,7 @@ services:
options:
openstack-origin: *openstack-origin
to:
- '20'
- '21'
relations:

2
src/tests/tests.yaml
View File

@ -1,7 +1,6 @@
charm_name: manila-ganesha
dev_bundles:
- bionic
- focal-victoria
- groovy-victoria
gate_bundles:
- bionic-rocky
@ -9,6 +8,7 @@ gate_bundles:
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
smoke_bundles:
- bionic-train
target_deploy_status: {}