From 33f301fe53780cf50cb5db6010733a09c161c199 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 11 Jul 2022 13:55:51 +0000 Subject: [PATCH] Add support for 4.2 Add support for Trilio 4.2 and refocus this branch CI on 4.2. Change-Id: I8312d73f312e26e9a96abb692412f4980726b3b7 --- osci.yaml | 64 ++--- ...c-queens-40.yaml => bionic-queens-42.yaml} | 2 +- src/tests/bundles/bionic-stein-40.yaml | 248 ---------------- src/tests/bundles/bionic-stein-41.yaml | 248 ---------------- src/tests/bundles/bionic-train-40.yaml | 265 ------------------ ...c-ussuri-41.yaml => bionic-ussuri-42.yaml} | 2 +- ...nic-train-41.yaml => focal-ussuri-42.yaml} | 125 ++++++--- src/tests/tests.yaml | 11 +- 8 files changed, 116 insertions(+), 849 deletions(-) rename src/tests/bundles/{bionic-queens-40.yaml => bionic-queens-42.yaml} (99%) delete mode 100644 src/tests/bundles/bionic-stein-40.yaml delete mode 100644 src/tests/bundles/bionic-stein-41.yaml delete mode 100644 src/tests/bundles/bionic-train-40.yaml rename src/tests/bundles/{bionic-ussuri-41.yaml => bionic-ussuri-42.yaml} (99%) rename src/tests/bundles/{bionic-train-41.yaml => focal-ussuri-42.yaml} (73%) diff --git a/osci.yaml b/osci.yaml index b77c989..ea181fa 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,78 +1,54 @@ - project: templates: - - charm-yoga-unit-jobs + - charm-unit-jobs-py36 + - charm-unit-jobs-py38 check: jobs: - charm-build - - bionic-queens-40_trilio-horizon - - bionic-stein-40_trilio-horizon - bionic-queens-41_trilio-horizon - - bionic-stein-41_trilio-horizon - - bionic-train-40_trilio-horizon - - bionic-train-41_trilio-horizon - - bionic-ussuri-41_trilio-horizon + - bionic-queens-42_trilio-horizon + - bionic-ussuri-42_trilio-horizon - focal-ussuri-41_trilio-horizon + - focal-ussuri-42_trilio-horizon vars: needs_charm_build: true charm_build_name: trilio-horizon-plugin build_type: charmcraft - job: - name: focal-ussuri-41_trilio-horizon + name: focal-ussuri-42_trilio-horizon parent: func-target dependencies: - osci-lint - tox-py36 - tox-py38 - charm-build + vars: + tox_extra_args: focal-ussuri-42 +- job: + name: focal-ussuri-41_trilio-horizon + parent: func-target + dependencies: + - focal-ussuri-42_trilio-horizon vars: tox_extra_args: focal-ussuri-41 - job: - name: bionic-ussuri-41_trilio-horizon + name: bionic-ussuri-42_trilio-horizon parent: func-target dependencies: - - focal-ussuri-41_trilio-horizon + - focal-ussuri-42_trilio-horizon vars: - tox_extra_args: bionic-ussuri-41 + tox_extra_args: bionic-ussuri-42 - job: - name: bionic-train-41_trilio-horizon + name: bionic-queens-42_trilio-horizon parent: func-target dependencies: - - focal-ussuri-41_trilio-horizon + - focal-ussuri-42_trilio-horizon vars: - tox_extra_args: bionic-train-41 -- job: - name: bionic-train-40_trilio-horizon - parent: func-target - dependencies: - - bionic-ussuri-41_trilio-horizon - vars: - tox_extra_args: bionic-train-40 -- job: - name: bionic-stein-41_trilio-horizon - parent: func-target - dependencies: - - bionic-train-41_trilio-horizon - vars: - tox_extra_args: bionic-stein-41 -- job: - name: bionic-stein-40_trilio-horizon - parent: func-target - dependencies: - - bionic-train-40_trilio-horizon - vars: - tox_extra_args: bionic-stein-40 + tox_extra_args: bionic-queens-42 - job: name: bionic-queens-41_trilio-horizon parent: func-target dependencies: - - bionic-stein-41_trilio-horizon + - bionic-queens-42_trilio-horizon vars: tox_extra_args: bionic-queens-41 - -- job: - name: bionic-queens-40_trilio-horizon - parent: func-target - dependencies: - - bionic-stein-40_trilio-horizon - vars: - tox_extra_args: bionic-queens-40 diff --git a/src/tests/bundles/bionic-queens-40.yaml b/src/tests/bundles/bionic-queens-42.yaml similarity index 99% rename from src/tests/bundles/bionic-queens-40.yaml rename to src/tests/bundles/bionic-queens-42.yaml index 6752136..f319544 100644 --- a/src/tests/bundles/bionic-queens-40.yaml +++ b/src/tests/bundles/bionic-queens-42.yaml @@ -7,7 +7,7 @@ variables: vault-charm-channel: &vault-charm-channel '1.7/edge' trilio-charm-channel: &trilio-charm-channel 'latest/stable' trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /' + triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /' series: &series bionic diff --git a/src/tests/bundles/bionic-stein-40.yaml b/src/tests/bundles/bionic-stein-40.yaml deleted file mode 100644 index e0f90f3..0000000 --- a/src/tests/bundles/bionic-stein-40.yaml +++ /dev/null @@ -1,248 +0,0 @@ -variables: - openstack-origin: &openstack-origin 'cloud:bionic-stein' - openstack-charm-channel: &openstack-charm-channel 'stein/edge' - ceph-charm-channel: &ceph-charm-channel 'octopus/edge' - rabbit-charm-channel: &rabbit-charm-channel '3.8/edge' - mysql-charm-channel: &mysql-charm-channel '5.7/edge' - vault-charm-channel: &vault-charm-channel '1.7/edge' - trilio-charm-channel: &trilio-charm-channel 'latest/stable' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /' - -series: &series bionic - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - 'keystone:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'neutron-api:shared-db' - - 'mysql:shared-db' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'glance:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'nova-cloud-controller:neutron-api' - - 'neutron-api:neutron-api' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'trilio-wlm:shared-db' - - 'mysql:shared-db' - - - 'trilio-wlm:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-wlm:identity-service' - - 'keystone:identity-service' - - - 'glance:ceph' - - 'ceph-mon:client' - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - 'ceph-osd:secrets-storage' - - 'vault:secrets' - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - 'vault:shared-db' - - 'mysql:shared-db' - - - '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' - - 'trilio-wlm:certificates' - - - 'trilio-data-mover:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-data-mover:juju-info' - - 'nova-compute:juju-info' - - - 'trilio-dm-api:identity-service' - - 'keystone:identity-service' - - - 'trilio-dm-api:shared-db' - - 'mysql:shared-db' - - - 'trilio-dm-api:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-dm-api:certificates' - - 'vault:certificates' - - - 'trilio-horizon-plugin:dashboard-plugin' - - 'openstack-dashboard:dashboard-plugin' - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - 'trilio-data-mover:ceph' - - 'ceph-mon:client' - - - 'trilio-data-mover:shared-db' - - 'mysql:shared-db' -applications: - glance: - charm: ch:glance - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - cinder: - charm: ch:cinder - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - keystone: - charm: ch:keystone - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - mysql: - charm: ch:percona-cluster - channel: *mysql-charm-channel - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: ch:neutron-api - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - neutron-gateway: - charm: ch:neutron-gateway - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: *openstack-charm-channel - num_units: 0 - nova-cloud-controller: - charm: ch:nova-cloud-controller - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - nova-compute: - charm: ch:nova-compute - channel: *openstack-charm-channel - num_units: 3 - constraints: mem=4G - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: ch:rabbitmq-server - channel: *rabbit-charm-channel - num_units: 1 - trilio-data-mover: - charm: ch:openstack-charmers-trilio-data-mover - channel: *trilio-charm-channel - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-dm-api: - charm: ch:openstack-charmers-trilio-dm-api - channel: *trilio-charm-channel - num_units: 1 - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-horizon-plugin: - charm: ../../../trilio-horizon-plugin.charm - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-wlm: - charm: ch:openstack-charmers-trilio-wlm - channel: *trilio-charm-channel - num_units: 1 - options: - triliovault-pkg-source: *triliovault-pkg-source - ceph-mon: - charm: ch:ceph-mon - channel: *ceph-charm-channel - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - ceph-osd: - charm: ch:ceph-osd - channel: *ceph-charm-channel - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - osd-encrypt-keymanager: vault - osd-encrypt: True - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-charm-channel - vault: - charm: ch:vault - channel: *vault-charm-channel - num_units: 1 - nfs-server-test-fixture: - charm: cs:~openstack-charmers-next/nfs-server-test-fixture - num_units: 1 - storage: - share: cinder,40G - openstack-dashboard: - charm: ch:openstack-dashboard - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin diff --git a/src/tests/bundles/bionic-stein-41.yaml b/src/tests/bundles/bionic-stein-41.yaml deleted file mode 100644 index 62adce1..0000000 --- a/src/tests/bundles/bionic-stein-41.yaml +++ /dev/null @@ -1,248 +0,0 @@ -variables: - openstack-origin: &openstack-origin 'cloud:bionic-stein' - openstack-charm-channel: &openstack-charm-channel 'stein/edge' - ceph-charm-channel: &ceph-charm-channel 'octopus/edge' - rabbit-charm-channel: &rabbit-charm-channel '3.8/edge' - mysql-charm-channel: &mysql-charm-channel '5.7/edge' - vault-charm-channel: &vault-charm-channel '1.7/edge' - trilio-charm-channel: &trilio-charm-channel 'latest/stable' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /' - -series: &series bionic - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - 'keystone:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'neutron-api:shared-db' - - 'mysql:shared-db' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'glance:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'nova-cloud-controller:neutron-api' - - 'neutron-api:neutron-api' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'trilio-wlm:shared-db' - - 'mysql:shared-db' - - - 'trilio-wlm:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-wlm:identity-service' - - 'keystone:identity-service' - - - 'glance:ceph' - - 'ceph-mon:client' - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - 'ceph-osd:secrets-storage' - - 'vault:secrets' - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - 'vault:shared-db' - - 'mysql:shared-db' - - - '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' - - 'trilio-wlm:certificates' - - - 'trilio-data-mover:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-data-mover:juju-info' - - 'nova-compute:juju-info' - - - 'trilio-dm-api:identity-service' - - 'keystone:identity-service' - - - 'trilio-dm-api:shared-db' - - 'mysql:shared-db' - - - 'trilio-dm-api:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-dm-api:certificates' - - 'vault:certificates' - - - 'trilio-horizon-plugin:dashboard-plugin' - - 'openstack-dashboard:dashboard-plugin' - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - 'trilio-data-mover:ceph' - - 'ceph-mon:client' - - - 'trilio-data-mover:shared-db' - - 'mysql:shared-db' -applications: - glance: - charm: ch:glance - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - cinder: - charm: ch:cinder - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - keystone: - charm: ch:keystone - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - mysql: - charm: ch:percona-cluster - channel: *mysql-charm-channel - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: ch:neutron-api - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - neutron-gateway: - charm: ch:neutron-gateway - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: *openstack-charm-channel - num_units: 0 - nova-cloud-controller: - charm: ch:nova-cloud-controller - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - nova-compute: - charm: ch:nova-compute - channel: *openstack-charm-channel - num_units: 3 - constraints: mem=4G - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: ch:rabbitmq-server - channel: *rabbit-charm-channel - num_units: 1 - trilio-data-mover: - charm: ch:openstack-charmers-trilio-data-mover - channel: *trilio-charm-channel - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-dm-api: - charm: ch:openstack-charmers-trilio-dm-api - channel: *trilio-charm-channel - num_units: 1 - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-horizon-plugin: - charm: ../../../trilio-horizon-plugin.charm - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-wlm: - charm: ch:openstack-charmers-trilio-wlm - channel: *trilio-charm-channel - num_units: 1 - options: - triliovault-pkg-source: *triliovault-pkg-source - ceph-mon: - charm: ch:ceph-mon - channel: *ceph-charm-channel - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - ceph-osd: - charm: ch:ceph-osd - channel: *ceph-charm-channel - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - osd-encrypt-keymanager: vault - osd-encrypt: True - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-charm-channel - vault: - charm: ch:vault - channel: *vault-charm-channel - num_units: 1 - nfs-server-test-fixture: - charm: cs:~openstack-charmers-next/nfs-server-test-fixture - num_units: 1 - storage: - share: cinder,40G - openstack-dashboard: - charm: ch:openstack-dashboard - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin diff --git a/src/tests/bundles/bionic-train-40.yaml b/src/tests/bundles/bionic-train-40.yaml deleted file mode 100644 index 9812efe..0000000 --- a/src/tests/bundles/bionic-train-40.yaml +++ /dev/null @@ -1,265 +0,0 @@ -variables: - openstack-origin: &openstack-origin 'cloud:bionic-train' - openstack-charm-channel: &openstack-charm-channel 'train/edge' - ceph-charm-channel: &ceph-charm-channel 'octopus/edge' - rabbit-charm-channel: &rabbit-charm-channel '3.8/edge' - mysql-charm-channel: &mysql-charm-channel '5.7/edge' - vault-charm-channel: &vault-charm-channel '1.7/edge' - trilio-charm-channel: &trilio-charm-channel 'latest/stable' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /' - - -series: &series bionic - -relations: - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:amqp-nova' - - 'rabbitmq-server:amqp' - - - 'keystone:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'neutron-api:shared-db' - - 'mysql:shared-db' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-gateway:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'glance:shared-db' - - 'mysql:shared-db' - - - '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' - - 'mysql:shared-db' - - - 'nova-cloud-controller:neutron-api' - - 'neutron-api:neutron-api' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'trilio-wlm:shared-db' - - 'mysql:shared-db' - - - 'trilio-wlm:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-wlm:identity-service' - - 'keystone:identity-service' - - - 'glance:ceph' - - 'ceph-mon:client' - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - 'ceph-osd:secrets-storage' - - 'vault:secrets' - - - 'cinder:storage-backend' - - 'cinder-ceph:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-mon:client' - - - 'cinder-ceph:ceph-access' - - 'nova-compute:ceph-access' - - - 'vault:shared-db' - - 'mysql:shared-db' - - - 'vault:certificates' - - 'keystone:certificates' - - - 'vault:certificates' - - 'neutron-api:certificates' - - - 'vault:certificates' - - 'cinder:certificates' - - - 'vault:certificates' - - 'glance:certificates' - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - 'placement:shared-db' - - 'mysql:shared-db' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - 'vault:certificates' - - 'placement:certificates' - - - 'vault:certificates' - - 'trilio-wlm:certificates' - - - 'trilio-data-mover:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-data-mover:juju-info' - - 'nova-compute:juju-info' - - - 'trilio-dm-api:identity-service' - - 'keystone:identity-service' - - - 'trilio-dm-api:shared-db' - - 'mysql:shared-db' - - - 'trilio-dm-api:amqp' - - 'rabbitmq-server:amqp' - - - 'trilio-dm-api:certificates' - - 'vault:certificates' - - - 'trilio-horizon-plugin:dashboard-plugin' - - 'openstack-dashboard:dashboard-plugin' - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - 'trilio-data-mover:ceph' - - 'ceph-mon:client' - - - 'trilio-data-mover:shared-db' - - 'mysql:shared-db' -applications: - glance: - charm: ch:glance - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - cinder: - charm: ch:cinder - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "None" - glance-api-version: 2 - keystone: - charm: ch:keystone - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - mysql: - charm: ch:percona-cluster - channel: *mysql-charm-channel - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 - neutron-api: - charm: ch:neutron-api - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - neutron-gateway: - charm: ch:neutron-gateway - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: *openstack-charm-channel - num_units: 0 - nova-cloud-controller: - charm: ch:nova-cloud-controller - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - nova-compute: - charm: ch:nova-compute - channel: *openstack-charm-channel - num_units: 3 - constraints: mem=4G - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - debug: true - cpu-model: kvm64 - cpu-mode: custom - # Allow for more retries when testing ontop of openstack - config-flags: block_device_allocate_retries=120 - rabbitmq-server: - charm: ch:rabbitmq-server - channel: *rabbit-charm-channel - num_units: 1 - trilio-data-mover: - charm: ch:openstack-charmers-trilio-data-mover - channel: *trilio-charm-channel - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-dm-api: - charm: ch:openstack-charmers-trilio-dm-api - channel: *trilio-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - triliovault-pkg-source: *triliovault-pkg-source - trilio-horizon-plugin: - charm: ../../../trilio-horizon-plugin.charm - options: - triliovault-pkg-source: *triliovault-pkg-source - trilio-wlm: - charm: ch:openstack-charmers-trilio-wlm - channel: *trilio-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - triliovault-pkg-source: *triliovault-pkg-source - ceph-mon: - charm: ch:ceph-mon - channel: *ceph-charm-channel - num_units: 3 - options: - source: *openstack-origin - expected-osd-count: 3 - ceph-osd: - charm: ch:ceph-osd - channel: *ceph-charm-channel - constraints: mem=1G - num_units: 3 - options: - source: *openstack-origin - osd-encrypt-keymanager: vault - osd-encrypt: True - storage: - osd-devices: cinder,40G - cinder-ceph: - charm: ch:cinder-ceph - channel: *openstack-charm-channel - vault: - charm: ch:vault - channel: *vault-charm-channel - num_units: 1 - placement: - charm: ch:placement - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin - nfs-server-test-fixture: - charm: cs:~openstack-charmers-next/nfs-server-test-fixture - num_units: 1 - storage: - share: cinder,40G - openstack-dashboard: - charm: ch:openstack-dashboard - channel: *openstack-charm-channel - num_units: 1 - options: - openstack-origin: *openstack-origin diff --git a/src/tests/bundles/bionic-ussuri-41.yaml b/src/tests/bundles/bionic-ussuri-42.yaml similarity index 99% rename from src/tests/bundles/bionic-ussuri-41.yaml rename to src/tests/bundles/bionic-ussuri-42.yaml index fbcdb56..855ace4 100644 --- a/src/tests/bundles/bionic-ussuri-41.yaml +++ b/src/tests/bundles/bionic-ussuri-42.yaml @@ -6,7 +6,7 @@ variables: mysql-charm-channel: &mysql-charm-channel '5.7/edge' vault-charm-channel: &vault-charm-channel '1.7/edge' trilio-charm-channel: &trilio-charm-channel 'latest/stable' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /' + triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /' series: &series bionic diff --git a/src/tests/bundles/bionic-train-41.yaml b/src/tests/bundles/focal-ussuri-42.yaml similarity index 73% rename from src/tests/bundles/bionic-train-41.yaml rename to src/tests/bundles/focal-ussuri-42.yaml index 4664c14..36d399f 100644 --- a/src/tests/bundles/bionic-train-41.yaml +++ b/src/tests/bundles/focal-ussuri-42.yaml @@ -1,15 +1,14 @@ variables: - openstack-origin: &openstack-origin 'cloud:bionic-train' - openstack-charm-channel: &openstack-charm-channel 'train/edge' + openstack-origin: &openstack-origin distro + openstack-charm-channel: &openstack-charm-channel 'ussuri/edge' ceph-charm-channel: &ceph-charm-channel 'octopus/edge' - rabbit-charm-channel: &rabbit-charm-channel '3.8/edge' - mysql-charm-channel: &mysql-charm-channel '5.7/edge' + rabbit-charm-channel: &rabbit-charm-channel '3.9/edge' + mysql-charm-channel: &mysql-charm-channel '8.0/edge' vault-charm-channel: &vault-charm-channel '1.7/edge' trilio-charm-channel: &trilio-charm-channel 'latest/stable' - triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /' + triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /' - -series: &series bionic +series: &series focal relations: - - 'nova-compute:amqp' @@ -18,8 +17,6 @@ relations: - 'rabbitmq-server:amqp' - - 'neutron-gateway:amqp-nova' - 'rabbitmq-server:amqp' - - - 'keystone:shared-db' - - 'mysql:shared-db' - - 'cinder:identity-service' - 'keystone:identity-service' - - 'nova-cloud-controller:identity-service' @@ -30,18 +27,12 @@ relations: - 'keystone:identity-service' - - 'neutron-openvswitch:neutron-plugin-api' - 'neutron-api:neutron-plugin-api' - - - 'cinder:shared-db' - - 'mysql:shared-db' - - - 'neutron-api:shared-db' - - 'mysql:shared-db' - - 'cinder:amqp' - 'rabbitmq-server:amqp' - - 'neutron-api:amqp' - 'rabbitmq-server:amqp' - - 'neutron-gateway:neutron-plugin-api' - 'neutron-api:neutron-plugin-api' - - - 'glance:shared-db' - - 'mysql:shared-db' - - 'glance:amqp' - 'rabbitmq-server:amqp' - - 'nova-cloud-controller:image-service' @@ -56,14 +47,10 @@ relations: - 'neutron-openvswitch:neutron-plugin' - - 'neutron-openvswitch:amqp' - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:shared-db' - - 'mysql:shared-db' - - 'nova-cloud-controller:neutron-api' - 'neutron-api:neutron-api' - - 'nova-cloud-controller:cloud-compute' - 'nova-compute:cloud-compute' - - - 'trilio-wlm:shared-db' - - 'mysql:shared-db' - - 'trilio-wlm:amqp' - 'rabbitmq-server:amqp' - - 'trilio-wlm:identity-service' @@ -80,8 +67,6 @@ relations: - 'ceph-mon:client' - - 'cinder-ceph:ceph-access' - 'nova-compute:ceph-access' - - - 'vault:shared-db' - - 'mysql:shared-db' - - 'vault:certificates' - 'keystone:certificates' - - 'vault:certificates' @@ -92,24 +77,20 @@ relations: - 'glance:certificates' - - 'vault:certificates' - 'nova-cloud-controller:certificates' - - - 'placement:shared-db' - - 'mysql:shared-db' + - - 'vault:certificates' + - 'trilio-wlm:certificates' - - 'placement:identity-service' - 'keystone:identity-service' - - 'placement:placement' - 'nova-cloud-controller:placement' - - 'vault:certificates' - 'placement:certificates' - - - 'vault:certificates' - - 'trilio-wlm:certificates' - - 'trilio-data-mover:amqp' - 'rabbitmq-server:amqp' - - 'trilio-data-mover:juju-info' - 'nova-compute:juju-info' - - 'trilio-dm-api:identity-service' - 'keystone:identity-service' - - - 'trilio-dm-api:shared-db' - - 'mysql:shared-db' - - 'trilio-dm-api:amqp' - 'rabbitmq-server:amqp' - - 'trilio-dm-api:certificates' @@ -120,9 +101,89 @@ relations: - 'keystone:identity-service' - - 'trilio-data-mover:ceph' - 'ceph-mon:client' + + - - 'trilio-dm-api:shared-db' + - 'trilio-dm-api-mysql-router:shared-db' + - - 'trilio-dm-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'trilio-dm-mysql-router:juju-info' + - 'nova-compute:juju-info' - - 'trilio-data-mover:shared-db' - - 'mysql:shared-db' + - 'trilio-dm-mysql-router:shared-db' + - - 'trilio-dm-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'trilio-wlm:shared-db' + - 'trilio-wlm-mysql-router:shared-db' + - - 'trilio-wlm-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - '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' + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' applications: + keystone-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + cinder-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + neutron-api-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + glance-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + nova-cloud-controller-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + trilio-dm-api-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + trilio-dm-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + trilio-wlm-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + vault-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + placement-mysql-router: + charm: ch:mysql-router + channel: *mysql-charm-channel + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + channel: *mysql-charm-channel + num_units: 3 + options: + source: *openstack-origin glance: charm: ch:glance channel: *openstack-charm-channel @@ -144,13 +205,6 @@ applications: options: openstack-origin: *openstack-origin admin-password: openstack - mysql: - charm: ch:percona-cluster - channel: *mysql-charm-channel - num_units: 1 - options: - innodb-buffer-pool-size: 256M - max-connections: 1000 neutron-api: charm: ch:neutron-api channel: *openstack-charm-channel @@ -159,6 +213,7 @@ applications: openstack-origin: *openstack-origin flat-network-providers: physnet1 neutron-security-groups: true + manage-neutron-plugin-legacy-mode: True neutron-gateway: charm: ch:neutron-gateway channel: *openstack-charm-channel diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 57c87b9..a73f102 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -11,16 +11,13 @@ configure: - zaza.openstack.charm_tests.nova.setup.create_flavors - zaza.openstack.charm_tests.nova.setup.manage_ssh_key gate_bundles: - - bionic-stein-40 - - bionic-stein-41 - - bionic-train-40 - - bionic-train-41 - - bionic-ussuri-41 + - focal-ussuri-42 - focal-ussuri-41 - - bionic-queens-40 + - bionic-ussuri-42 + - bionic-queens-42 - bionic-queens-41 smoke_bundles: - - bionic-train-40 + - focal-ussuri-42 target_deploy_status: vault: workload-status: blocked