From d1bd93b6c5ea11185f466bcef463f8d5c11fdffe Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Mon, 15 Feb 2021 09:10:41 +0100 Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. Libraries sync. 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: I238e8a36b033594c67ffcefa325998f2eba2a659 --- osci.yaml | 22 ++- tests/bundles/focal-wallaby.yaml | 247 +++++++++++++++++++++++++++++ tests/bundles/hirsute-wallaby.yaml | 247 +++++++++++++++++++++++++++++ tests/tests.yaml | 4 +- 4 files changed, 515 insertions(+), 5 deletions(-) create mode 100644 tests/bundles/focal-wallaby.yaml create mode 100644 tests/bundles/hirsute-wallaby.yaml diff --git a/osci.yaml b/osci.yaml index d2d757a0..445c405a 100644 --- a/osci.yaml +++ b/osci.yaml @@ -3,7 +3,9 @@ - charm-unit-jobs check: jobs: + - ceph-hirsute-wallaby_nova - ceph-groovy-victoria_nova + - ceph-focal-wallaby_nova - ceph-focal-victoria_nova - ceph-focal-ussuri_nova - bionic-ussuri @@ -13,12 +15,12 @@ - xenial-mitaka - job: - name: ceph-groovy-victoria_nova + name: ceph-focal-ussuri_nova parent: func-target dependencies: &smoke-jobs - bionic-ussuri vars: - tox_extra_args: ceph:groovy-victoria + tox_extra_args: ceph:focal-ussuri - job: name: ceph-focal-victoria_nova parent: func-target @@ -26,8 +28,20 @@ vars: tox_extra_args: ceph:focal-victoria - job: - name: ceph-focal-ussuri_nova + name: ceph-focal-wallaby_nova parent: func-target dependencies: *smoke-jobs vars: - tox_extra_args: ceph:focal-ussuri \ No newline at end of file + tox_extra_args: ceph:focal-wallaby +- job: + name: ceph-groovy-victoria_nova + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: ceph:groovy-victoria +- job: + name: ceph-hirsute-wallaby_nova + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: ceph:hirsute-wallaby diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml new file mode 100644 index 00000000..212fcf62 --- /dev/null +++ b/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,247 @@ +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': + constraints: mem=4096M cores=4 + '11': + '12': + '13': + '14': + '15': + '16': + '17': + '18': + '19': + +applications: + + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-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' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 6 + storage: + osd-devices: '10G' + options: + source: *openstack-origin + to: + - '11' + - '12' + - '13' + - '14' + - '15' + - '16' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + monitor-count: '3' + to: + - '17' + - '18' + - '19' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + debug: true + to: + - '4' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '5' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '6' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '7' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '8' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '9' + + nova-compute: + charm: ../../../nova-compute + num_units: 1 + storage: + ephemeral-device: '40G' + options: + openstack-origin: *openstack-origin + config-flags: auto_assign_floating_ip=False + enable-live-migration: false + aa-profile-mode: enforce + debug: true + pool-type: erasure-coded + ec-profile-k: 4 + ec-profile-m: 2 + libvirt-image-backend: rbd + to: + - '10' + +relations: + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'nova-compute:ceph' + - 'ceph-mon:client' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-compute: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:identity-service' + - 'keystone:identity-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:neutron-api' + - 'nova-cloud-controller:neutron-api' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'rabbitmq-server:amqp' + - 'neutron-openvswitch:amqp' + + - - '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' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 00000000..a99b7a28 --- /dev/null +++ b/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,247 @@ +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': + constraints: mem=4096M cores=4 + '11': + '12': + '13': + '14': + '15': + '16': + '17': + '18': + '19': + +applications: + + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-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' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 6 + storage: + osd-devices: '10G' + options: + source: *openstack-origin + to: + - '11' + - '12' + - '13' + - '14' + - '15' + - '16' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *openstack-origin + monitor-count: '3' + to: + - '17' + - '18' + - '19' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + debug: true + to: + - '4' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '5' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '6' + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '7' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '8' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '9' + + nova-compute: + charm: ../../../nova-compute + num_units: 1 + storage: + ephemeral-device: '40G' + options: + openstack-origin: *openstack-origin + config-flags: auto_assign_floating_ip=False + enable-live-migration: false + aa-profile-mode: enforce + debug: true + pool-type: erasure-coded + ec-profile-k: 4 + ec-profile-m: 2 + libvirt-image-backend: rbd + to: + - '10' + +relations: + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'nova-compute:ceph' + - 'ceph-mon:client' + + - - 'nova-compute:image-service' + - 'glance:image-service' + + - - 'nova-compute: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:identity-service' + - 'keystone:identity-service' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:cloud-compute' + - 'nova-compute:cloud-compute' + + - - 'nova-cloud-controller:image-service' + - 'glance:image-service' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:identity-service' + - 'keystone:identity-service' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller:quantum-network-service' + - 'neutron-gateway:quantum-network-service' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:neutron-api' + - 'nova-cloud-controller:neutron-api' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - 'nova-compute:neutron-plugin' + - 'neutron-openvswitch:neutron-plugin' + + - - 'rabbitmq-server:amqp' + - 'neutron-openvswitch:amqp' + + - - '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' diff --git a/tests/tests.yaml b/tests/tests.yaml index 0329df1a..9cf1f680 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,6 +5,7 @@ smoke_bundles: gate_bundles: - ceph: groovy-victoria +- ceph: focal-wallaby - ceph: focal-victoria - ceph: focal-ussuri - bionic-ussuri @@ -19,6 +20,7 @@ dev_bundles: - xenial-pike - xenial-queens - bionic-rocky +- ceph: hirsute-wallaby configure: - ceph: @@ -52,4 +54,4 @@ tests: tests_options: force_deploy: - - groovy-victoria + - hirsute-wallaby