Test bundles for focal-wallaby and hirsute-wallaby
These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. Sync libraries. hisute-wallaby test is disabled (moved to dev) due to [1] as bundle may reference a reactive charm. [1] https://github.com/juju-solutions/layer-basic/issues/194 Change-Id: I39929fbe3626c83e985d6fb9b21422a1b17e81d1
This commit is contained in:
parent
a6dc972b09
commit
febc35ea36
16
osci.yaml
16
osci.yaml
|
@ -10,7 +10,9 @@
|
||||||
- bionic-train
|
- bionic-train
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- ceph-focal-victoria
|
- ceph-focal-victoria
|
||||||
|
- ceph-focal-wallaby
|
||||||
- ceph-groovy-victoria
|
- ceph-groovy-victoria
|
||||||
|
- ceph-hirsute-wallaby
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ceph-focal-ussuri
|
name: ceph-focal-ussuri
|
||||||
|
@ -25,9 +27,21 @@
|
||||||
dependencies: *smoke-jobs
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: ceph:focal-victoria
|
tox_extra_args: ceph:focal-victoria
|
||||||
|
- job:
|
||||||
|
name: ceph-focal-wallaby
|
||||||
|
parent: func-target
|
||||||
|
dependencies: *smoke-jobs
|
||||||
|
vars:
|
||||||
|
tox_extra_args: ceph:focal-wallaby
|
||||||
- job:
|
- job:
|
||||||
name: ceph-groovy-victoria
|
name: ceph-groovy-victoria
|
||||||
parent: func-target
|
parent: func-target
|
||||||
dependencies: *smoke-jobs
|
dependencies: *smoke-jobs
|
||||||
vars:
|
vars:
|
||||||
tox_extra_args: ceph:groovy-victoria
|
tox_extra_args: ceph:groovy-victoria
|
||||||
|
- job:
|
||||||
|
name: ceph-hirsute-wallaby
|
||||||
|
parent: func-target
|
||||||
|
dependencies: *smoke-jobs
|
||||||
|
vars:
|
||||||
|
tox_extra_args: ceph:hirsute-wallaby
|
||||||
|
|
|
@ -0,0 +1,138 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin cloud:focal-wallaby
|
||||||
|
|
||||||
|
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':
|
||||||
|
'8':
|
||||||
|
'9':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
'12':
|
||||||
|
'13':
|
||||||
|
'14':
|
||||||
|
'15':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-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'
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-osd
|
||||||
|
num_units: 6
|
||||||
|
storage:
|
||||||
|
osd-devices: '10G'
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
- '4'
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
ceph-radosgw:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-radosgw
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '15'
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
monitor-count: '3'
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
- '10'
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '13'
|
||||||
|
|
||||||
|
glance:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
pool-type: erasure-coded
|
||||||
|
ec-profile-k: 4
|
||||||
|
ec-profile-m: 2
|
||||||
|
ec-profile-plugin: jerasure
|
||||||
|
to:
|
||||||
|
- '14'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'ceph-osd:mon'
|
||||||
|
- 'ceph-mon:osd'
|
||||||
|
|
||||||
|
- - 'ceph-radosgw:mon'
|
||||||
|
- 'ceph-mon:radosgw'
|
||||||
|
- - 'ceph-radosgw:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'ceph-radosgw:object-store'
|
||||||
|
- 'glance:object-store'
|
|
@ -0,0 +1,138 @@
|
||||||
|
variables:
|
||||||
|
openstack-origin: &openstack-origin distro
|
||||||
|
|
||||||
|
series: hirsute
|
||||||
|
|
||||||
|
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':
|
||||||
|
'8':
|
||||||
|
'9':
|
||||||
|
'10':
|
||||||
|
'11':
|
||||||
|
'12':
|
||||||
|
'13':
|
||||||
|
'14':
|
||||||
|
'15':
|
||||||
|
|
||||||
|
applications:
|
||||||
|
|
||||||
|
keystone-mysql-router:
|
||||||
|
charm: cs:~openstack-charmers-next/mysql-router
|
||||||
|
glance-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'
|
||||||
|
|
||||||
|
ceph-osd:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-osd
|
||||||
|
num_units: 6
|
||||||
|
storage:
|
||||||
|
osd-devices: '10G'
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '3'
|
||||||
|
- '4'
|
||||||
|
- '5'
|
||||||
|
- '6'
|
||||||
|
- '7'
|
||||||
|
- '8'
|
||||||
|
|
||||||
|
ceph-radosgw:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-radosgw
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '15'
|
||||||
|
|
||||||
|
ceph-mon:
|
||||||
|
charm: cs:~openstack-charmers-next/ceph-mon
|
||||||
|
num_units: 3
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
monitor-count: '3'
|
||||||
|
to:
|
||||||
|
- '9'
|
||||||
|
- '10'
|
||||||
|
- '11'
|
||||||
|
|
||||||
|
rabbitmq-server:
|
||||||
|
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
source: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '12'
|
||||||
|
|
||||||
|
keystone:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/keystone
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
to:
|
||||||
|
- '13'
|
||||||
|
|
||||||
|
glance:
|
||||||
|
expose: True
|
||||||
|
charm: cs:~openstack-charmers-next/glance
|
||||||
|
num_units: 1
|
||||||
|
options:
|
||||||
|
openstack-origin: *openstack-origin
|
||||||
|
pool-type: erasure-coded
|
||||||
|
ec-profile-k: 4
|
||||||
|
ec-profile-m: 2
|
||||||
|
ec-profile-plugin: jerasure
|
||||||
|
to:
|
||||||
|
- '14'
|
||||||
|
|
||||||
|
relations:
|
||||||
|
- - 'keystone:shared-db'
|
||||||
|
- 'keystone-mysql-router:shared-db'
|
||||||
|
- - 'keystone-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:shared-db'
|
||||||
|
- 'glance-mysql-router:shared-db'
|
||||||
|
- - 'glance-mysql-router:db-router'
|
||||||
|
- 'mysql-innodb-cluster:db-router'
|
||||||
|
|
||||||
|
- - 'glance:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
|
||||||
|
- - 'glance:amqp'
|
||||||
|
- 'rabbitmq-server:amqp'
|
||||||
|
|
||||||
|
- - 'glance:ceph'
|
||||||
|
- 'ceph-mon:client'
|
||||||
|
|
||||||
|
- - 'ceph-osd:mon'
|
||||||
|
- 'ceph-mon:osd'
|
||||||
|
|
||||||
|
- - 'ceph-radosgw:mon'
|
||||||
|
- 'ceph-mon:radosgw'
|
||||||
|
- - 'ceph-radosgw:identity-service'
|
||||||
|
- 'keystone:identity-service'
|
||||||
|
- - 'ceph-radosgw:object-store'
|
||||||
|
- 'glance:object-store'
|
|
@ -14,13 +14,16 @@ gate_bundles:
|
||||||
- bionic-ussuri
|
- bionic-ussuri
|
||||||
- ceph: focal-ussuri
|
- ceph: focal-ussuri
|
||||||
- ceph: focal-victoria
|
- ceph: focal-victoria
|
||||||
|
- ceph: focal-wallaby
|
||||||
- ceph: groovy-victoria
|
- ceph: groovy-victoria
|
||||||
|
|
||||||
dev_bundles:
|
dev_bundles:
|
||||||
- trusty-mitaka
|
- trusty-mitaka
|
||||||
- xenial-ocata
|
- xenial-ocata
|
||||||
- xenial-pike
|
- xenial-pike
|
||||||
- xenial-queens
|
- xenial-queens
|
||||||
- bionic-rocky
|
- bionic-rocky
|
||||||
|
- ceph: hirsute-wallaby
|
||||||
|
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||||
|
@ -35,6 +38,7 @@ configure:
|
||||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||||
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
|
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
|
||||||
- zaza.openstack.charm_tests.tempest.setup.render_tempest_config_keystone_v3
|
- zaza.openstack.charm_tests.tempest.setup.render_tempest_config_keystone_v3
|
||||||
|
|
||||||
tests:
|
tests:
|
||||||
- ceph:
|
- ceph:
|
||||||
- zaza.openstack.charm_tests.glance.tests.GlanceTest
|
- zaza.openstack.charm_tests.glance.tests.GlanceTest
|
||||||
|
@ -49,6 +53,7 @@ tests:
|
||||||
- zaza.openstack.charm_tests.tempest.tests.TempestTest
|
- zaza.openstack.charm_tests.tempest.tests.TempestTest
|
||||||
- zaza.openstack.charm_tests.glance.tests.GlanceTest
|
- zaza.openstack.charm_tests.glance.tests.GlanceTest
|
||||||
- zaza.openstack.charm_tests.policyd.tests.GlanceTests
|
- zaza.openstack.charm_tests.policyd.tests.GlanceTests
|
||||||
|
|
||||||
tests_options:
|
tests_options:
|
||||||
tempest:
|
tempest:
|
||||||
full_run:
|
full_run:
|
||||||
|
@ -56,4 +61,4 @@ tests_options:
|
||||||
policyd:
|
policyd:
|
||||||
service: glance
|
service: glance
|
||||||
force_deploy:
|
force_deploy:
|
||||||
- groovy-victoria
|
- hirsute-wallaby
|
||||||
|
|
Loading…
Reference in New Issue