From c6441372e4231e923a3545399bfa80c7316e192e Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 15 Jun 2022 12:49:07 +0100 Subject: [PATCH] Update the bundles to use the stable track, edge risk for yoga The bundles for the yoga channel currently point to "latest/edge" channel for all the charms. This update points the charms to the appropriate channel for the charm being used, either from ceph, openstack, ovn or the misc tracks. Remove impish bundles as EOL. Make yoga voting as the charm on stable/yoga should support yoga. Change-Id: Ia498b3fcbb22ad31b4a58b8c3979df5a1067e2b2 --- osci.yaml | 15 +- test-requirements.txt | 5 +- tests/bundles/focal-xena-ec.yaml | 18 +- tests/bundles/focal-xena.yaml | 18 +- tests/bundles/focal-yoga-ec.yaml | 18 +- tests/bundles/focal-yoga.yaml | 18 +- tests/bundles/impish-xena-ec.yaml | 303 ------------------------------ tests/bundles/impish-xena.yaml | 293 ----------------------------- tests/bundles/jammy-yoga-ec.yaml | 18 +- tests/bundles/jammy-yoga.yaml | 18 +- tests/tests.yaml | 10 +- 11 files changed, 69 insertions(+), 665 deletions(-) delete mode 100644 tests/bundles/impish-xena-ec.yaml delete mode 100644 tests/bundles/impish-xena.yaml diff --git a/osci.yaml b/osci.yaml index 2026585..bb87eb9 100644 --- a/osci.yaml +++ b/osci.yaml @@ -7,12 +7,8 @@ check: jobs: - focal-xena-ec_cinder-ceph - - focal-yoga-ec_cinder-ceph: - voting: false - - impish-xena-ec_cinder-ceph: - voting: false - - jammy-yoga-ec_cinder-ceph: - voting: false + - focal-yoga-ec_cinder-ceph + - jammy-yoga-ec_cinder-ceph vars: needs_charm_build: true charm_build_name: cinder-ceph @@ -36,13 +32,6 @@ - focal-xena-ec_cinder-ceph vars: tox_extra_args: focal-yoga-ec -- job: - name: impish-xena-ec_cinder-ceph - parent: func-target - dependencies: - - focal-xena-ec_cinder-ceph - vars: - tox_extra_args: impish-xena-ec - job: name: jammy-yoga-ec_cinder-ceph parent: func-target diff --git a/test-requirements.txt b/test-requirements.txt index 0c35ba9..145b26b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -21,6 +21,8 @@ cliff<3.0.0 # Dependencies of stestr. Newer versions use keywords that didn't exist in # python 3.5 yet (e.g. "ModuleNotFoundError") +importlib-metadata<5.0.0; python_version < '3.8' and python_version >= '3.6' +importlib-resources<5.0.0; python_version < '3.8' and python_version >= '3.6' importlib-metadata<3.0.0; python_version < '3.6' importlib-resources<3.0.0; python_version < '3.6' @@ -37,7 +39,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack # Needed for charm-glance: -git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' +git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8' +tempest<31.0.0;python_version<'3.8' and python_version>='3.6' tempest<24.0.0;python_version<'3.6' croniter # needed for charm-rabbitmq-server unit tests diff --git a/tests/bundles/focal-xena-ec.yaml b/tests/bundles/focal-xena-ec.yaml index 42336c0..1d7afb6 100644 --- a/tests/bundles/focal-xena-ec.yaml +++ b/tests/bundles/focal-xena-ec.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-xena @@ -32,22 +34,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -58,7 +60,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -94,7 +96,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 6962604..bbc6bdc 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-xena @@ -29,22 +31,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -55,7 +57,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -88,7 +90,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/bundles/focal-yoga-ec.yaml b/tests/bundles/focal-yoga-ec.yaml index 99f914f..31e850c 100644 --- a/tests/bundles/focal-yoga-ec.yaml +++ b/tests/bundles/focal-yoga-ec.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-yoga @@ -32,22 +34,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -58,7 +60,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -94,7 +96,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 7508800..201bb5e 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-yoga @@ -29,22 +31,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -55,7 +57,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -88,7 +90,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/bundles/impish-xena-ec.yaml b/tests/bundles/impish-xena-ec.yaml deleted file mode 100644 index 01cd116..0000000 --- a/tests/bundles/impish-xena-ec.yaml +++ /dev/null @@ -1,303 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series impish - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - 18: - 19: - 20: - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 6 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - '18' - - '19' - - '20' - channel: quincy/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - channel: quincy/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '9' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - channel: yoga/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - channel: yoga/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - channel: yoga/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - channel: yoga/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: yoga/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: yoga/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - channel: yoga/edge - - cinder-ceph: - charm: ../../cinder-ceph.charm - options: - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - - nova-compute: - charm: ch: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 - to: - - '17' - channel: yoga/edge - -relations: - - - - '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' - - - - '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' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - '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' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml deleted file mode 100644 index 0c3d2cb..0000000 --- a/tests/bundles/impish-xena.yaml +++ /dev/null @@ -1,293 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series impish - -machines: - 0: - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - 15: - 16: - # for the nova-compute unit - 17: - constraints: mem=4G cores=4 root-disk=20G - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: '10G' - options: - osd-devices: '/dev/test-non-existent' - source: *openstack-origin - to: - - '3' - - '4' - - '5' - channel: quincy/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - monitor-count: '3' - source: *openstack-origin - to: - - '6' - - '7' - - '8' - channel: quincy/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '9' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '10' - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '11' - channel: yoga/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '12' - channel: yoga/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - channel: yoga/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '14' - channel: yoga/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: yoga/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: yoga/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - glance-api-version: 2 - to: - - '16' - channel: yoga/edge - - cinder-ceph: - charm: ../../cinder-ceph.charm - - nova-compute: - charm: ch: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 - to: - - '17' - channel: yoga/edge - -relations: - - - - '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' - - - - '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' - - - - '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' - - - - 'glance:ceph' - - 'ceph-mon:client' - - - - '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' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' diff --git a/tests/bundles/jammy-yoga-ec.yaml b/tests/bundles/jammy-yoga-ec.yaml index d5d8dde..eaa6320 100644 --- a/tests/bundles/jammy-yoga-ec.yaml +++ b/tests/bundles/jammy-yoga-ec.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin distro @@ -32,22 +34,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -58,7 +60,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -94,7 +96,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index b39e2f1..9215e43 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin distro @@ -29,22 +31,22 @@ applications: nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge neutron-api-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster @@ -55,7 +57,7 @@ applications: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-osd: charm: ch:ceph-osd @@ -88,7 +90,7 @@ applications: num_units: 1 to: - '9' - channel: latest/edge + channel: 3.9/edge nova-cloud-controller: charm: ch:nova-cloud-controller diff --git a/tests/tests.yaml b/tests/tests.yaml index 5180cf7..4c9a81d 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,20 +5,18 @@ comment: | cinder and ceph-mon zaza charm tests. smoke_bundles: - - focal-xena + - focal-yoga gate_bundles: - focal-xena-ec - focal-xena - - impish-xena-ec - - impish-xena - -dev_bundles: - focal-yoga-ec - focal-yoga - jammy-yoga-ec - jammy-yoga +dev_bundles: [] + configure: - zaza.openstack.charm_tests.glance.setup.add_cirros_image - zaza.openstack.charm_tests.glance.setup.add_lts_image @@ -45,7 +43,5 @@ tests_options: policyd: service: cinder force_deploy: - - impish-xena - - impish-xena-ec - jammy-yoga - jammy-yoga-ec