Test bundles for focal-wallaby and hirsute-wallaby

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

hisute-wallaby test is disabled (moved to dev) due to [1].

[1] https://github.com/juju-solutions/layer-basic/issues/194

Change-Id: Ibc09d03ed16847fa81c50487b8c7ded9d87b90e3
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
This commit is contained in:
Alex Kavanagh 2021-03-05 12:35:29 +00:00 committed by Aurelien Lourot
parent c3f8648f20
commit 0169df4f3d
4 changed files with 809 additions and 5 deletions

View File

@ -9,7 +9,9 @@
- bionic-ussuri-pacemaker-remote-ssl
- focal-ussuri-pacemaker-remote-ssl
- focal-victoria-pacemaker-remote-ssl
- focal-wallaby-pacemaker-remote-ssl
- groovy-victoria-pacemaker-remote-ssl
- hirsute-wallaby-pacemaker-remote-ssl
vars:
needs_charm_build: true
charm_build_name: masakari-monitors
@ -44,9 +46,21 @@
dependencies: *smoke-jobs
vars:
tox_extra_args: focal-victoria-pacemaker-remote-ssl
- job:
name: focal-wallaby-pacemaker-remote-ssl
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: focal-wallaby-pacemaker-remote-ssl
- job:
name: groovy-victoria-pacemaker-remote-ssl
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: groovy-victoria-pacemaker-remote-ssl
tox_extra_args: groovy-victoria-pacemaker-remote-ssl
- job:
name: hirsute-wallaby-pacemaker-remote-ssl
parent: func-target
dependencies: *smoke-jobs
vars:
tox_extra_args: hirsute-wallaby-pacemaker-remote-ssl

View File

@ -0,0 +1,390 @@
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':
constraints: mem=4096M
'9':
constraints: mem=4096M
'10':
constraints: mem=4096M
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
'22':
'23':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
masakari-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
placement-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'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '3'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '6'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '7'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
worker-multiplier: 0.25
debug: true
to:
- '23'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 3
constraints: mem=4G
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
debug: true
cpu-model: kvm64
cpu-mode: custom
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
to:
- '8'
- '9'
- '10'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '11'
masakari:
charm: cs:~openstack-charmers-next/masakari
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '12'
- '13'
- '14'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
to:
- '15'
- '16'
- '17'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
constraints: mem=1G
num_units: 3
options:
source: *openstack-origin
storage:
osd-devices: cinder,40G
to:
- '18'
- '19'
- '20'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
masakari-monitors:
charm: ../../masakari-monitors
hacluster:
charm: cs:~openstack-charmers-next/hacluster
options:
corosync_transport: unicast
cluster_count: 3
pacemaker-remote:
charm: cs:~openstack-charmers-next/pacemaker-remote
options:
enable-stonith: False
enable-resources: False
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
to:
- '21'
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '22'
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp-nova'
- 'rabbitmq-server:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'neutron-openvswitch:neutron-plugin-api'
- 'neutron-api:neutron-plugin-api'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:neutron-plugin-api'
- 'neutron-api:neutron-plugin-api'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'neutron-openvswitch:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:neutron-api'
- 'neutron-api:neutron-api'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'masakari:shared-db'
- 'masakari-mysql-router:shared-db'
- - 'masakari-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'masakari:amqp'
- 'rabbitmq-server:amqp'
- - 'masakari:identity-service'
- 'keystone:identity-service'
- - 'glance:ceph'
- 'ceph-mon:client'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'cinder:storage-backend'
- 'cinder-ceph:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-mon:client'
- - 'cinder-ceph:ceph-access'
- 'nova-compute:ceph-access'
- - 'nova-compute:juju-info'
- 'masakari-monitors:container'
- - 'masakari:ha'
- 'hacluster:ha'
- - 'keystone:identity-credentials'
- 'masakari-monitors:identity-credentials'
- - 'nova-compute:juju-info'
- 'pacemaker-remote:juju-info'
- - 'hacluster:pacemaker-remote'
- 'pacemaker-remote:pacemaker-remote'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:certificates'
- 'neutron-api:certificates'
- - 'vault:certificates'
- 'cinder:certificates'
- - 'vault:certificates'
- 'glance:certificates'
- - 'vault:certificates'
- 'nova-cloud-controller:certificates'
- - 'vault:certificates'
- 'masakari:certificates'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'vault:certificates'
- 'placement:certificates'

View File

@ -0,0 +1,390 @@
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':
constraints: mem=4096M
'9':
constraints: mem=4096M
'10':
constraints: mem=4096M
'11':
'12':
'13':
'14':
'15':
'16':
'17':
'18':
'19':
'20':
'21':
'22':
'23':
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
cinder-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
neutron-api-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
masakari-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
vault-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
placement-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'
glance:
charm: cs:~openstack-charmers-next/glance
num_units: 1
options:
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '3'
cinder:
charm: cs:~openstack-charmers-next/cinder
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: "None"
glance-api-version: 2
to:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
admin-password: openstack
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '5'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
num_units: 1
options:
manage-neutron-plugin-legacy-mode: true
flat-network-providers: physnet1
neutron-security-groups: true
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '6'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
openstack-origin: *openstack-origin
worker-multiplier: 0.25
to:
- '7'
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
openstack-origin: *openstack-origin
worker-multiplier: 0.25
debug: true
to:
- '23'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
num_units: 3
constraints: mem=4G
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
openstack-origin: *openstack-origin
debug: true
cpu-model: kvm64
cpu-mode: custom
# Allow for more retries when testing ontop of openstack
config-flags: block_device_allocate_retries=120
to:
- '8'
- '9'
- '10'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '11'
masakari:
charm: cs:~openstack-charmers-next/masakari
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '12'
- '13'
- '14'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
num_units: 3
options:
source: *openstack-origin
expected-osd-count: 3
to:
- '15'
- '16'
- '17'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
constraints: mem=1G
num_units: 3
options:
source: *openstack-origin
storage:
osd-devices: cinder,40G
to:
- '18'
- '19'
- '20'
cinder-ceph:
charm: cs:~openstack-charmers-next/cinder-ceph
masakari-monitors:
charm: ../../masakari-monitors
hacluster:
charm: cs:~openstack-charmers-next/hacluster
options:
corosync_transport: unicast
cluster_count: 3
pacemaker-remote:
charm: cs:~openstack-charmers-next/pacemaker-remote
options:
enable-stonith: False
enable-resources: False
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
to:
- '21'
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '22'
relations:
- - 'nova-compute:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:amqp-nova'
- 'rabbitmq-server:amqp'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'nova-cloud-controller:identity-service'
- 'keystone:identity-service'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'neutron-api:identity-service'
- 'keystone:identity-service'
- - 'neutron-openvswitch:neutron-plugin-api'
- 'neutron-api:neutron-plugin-api'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'neutron-api:shared-db'
- 'neutron-api-mysql-router:shared-db'
- - 'neutron-api-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-api:amqp'
- 'rabbitmq-server:amqp'
- - 'neutron-gateway:neutron-plugin-api'
- 'neutron-api:neutron-plugin-api'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:image-service'
- 'glance:image-service'
- - 'nova-compute:image-service'
- 'glance:image-service'
- - 'nova-cloud-controller:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:quantum-network-service'
- 'neutron-gateway:quantum-network-service'
- - 'nova-compute:neutron-plugin'
- 'neutron-openvswitch:neutron-plugin'
- - 'neutron-openvswitch:amqp'
- 'rabbitmq-server:amqp'
- - 'nova-cloud-controller:shared-db'
- 'nova-cloud-controller-mysql-router:shared-db'
- - 'nova-cloud-controller-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nova-cloud-controller:neutron-api'
- 'neutron-api:neutron-api'
- - 'nova-cloud-controller:cloud-compute'
- 'nova-compute:cloud-compute'
- - 'masakari:shared-db'
- 'masakari-mysql-router:shared-db'
- - 'masakari-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'masakari:amqp'
- 'rabbitmq-server:amqp'
- - 'masakari:identity-service'
- 'keystone:identity-service'
- - 'glance:ceph'
- 'ceph-mon:client'
- - 'ceph-mon:osd'
- 'ceph-osd:mon'
- - 'cinder:storage-backend'
- 'cinder-ceph:storage-backend'
- - 'cinder-ceph:ceph'
- 'ceph-mon:client'
- - 'cinder-ceph:ceph-access'
- 'nova-compute:ceph-access'
- - 'nova-compute:juju-info'
- 'masakari-monitors:container'
- - 'masakari:ha'
- 'hacluster:ha'
- - 'keystone:identity-credentials'
- 'masakari-monitors:identity-credentials'
- - 'nova-compute:juju-info'
- 'pacemaker-remote:juju-info'
- - 'hacluster:pacemaker-remote'
- 'pacemaker-remote:pacemaker-remote'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:certificates'
- 'keystone:certificates'
- - 'vault:certificates'
- 'neutron-api:certificates'
- - 'vault:certificates'
- 'cinder:certificates'
- - 'vault:certificates'
- 'glance:certificates'
- - 'vault:certificates'
- 'nova-cloud-controller:certificates'
- - 'vault:certificates'
- 'masakari:certificates'
- - 'placement:shared-db'
- 'placement-mysql-router:shared-db'
- - 'placement-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'placement:identity-service'
- 'keystone:identity-service'
- - 'placement:placement'
- 'nova-cloud-controller:placement'
- - 'vault:certificates'
- 'placement:certificates'

View File

@ -1,6 +1,8 @@
charm_name: masakari-monitors
tests:
- zaza.openstack.charm_tests.masakari.tests.MasakariTest
configure:
- zaza.openstack.charm_tests.vault.setup.auto_initialize
- zaza.openstack.charm_tests.glance.setup.add_cirros_image
@ -9,18 +11,25 @@ configure:
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.masakari.setup.create_segments
gate_bundles:
# Rocky disabled until https://review.opendev.org/#/c/647756/ lands in
# packaging
# - bionic-rocky-pacemaker-remote-ssl
- bionic-stein-pacemaker-remote-ssl
- bionic-train-pacemaker-remote-ssl
- bionic-ussuri-pacemaker-remote-ssl
- focal-ussuri-pacemaker-remote-ssl
- focal-victoria-pacemaker-remote-ssl
- focal-wallaby-pacemaker-remote-ssl
- groovy-victoria-pacemaker-remote-ssl
dev_bundles:
# Rocky disabled until https://review.opendev.org/#/c/647756/ lands in
# packaging
- bionic-rocky-pacemaker-remote-ssl
- hirsute-wallaby-pacemaker-remote-ssl
smoke_bundles:
- focal-ussuri-pacemaker-remote-ssl
target_deploy_status:
easyrsa:
workload-status-message: Certificate Authority connected.
@ -37,6 +46,7 @@ target_deploy_status:
ceph-mon:
workload-status: waiting
workload-status-message: "Monitor bootstrapped but waiting for number of OSDs to reach expected-osd-count (3)"
tests_options:
force_deploy:
- groovy-victoria-pacemaker-remote-ssl
- hirsute-wallaby-pacemaker-remote-ssl