From dfb225b51ed5ce6de29090b8828ad91e74742e4f Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Wed, 29 Mar 2023 21:01:49 +0000 Subject: [PATCH] Enable jammy-antelope voting and drop kinetic-zed tests * Voting was turned on for jammy-antelope in the project-template for charm-functional-jobs in zosci-config * Voting for jammy-antelope bundles with non-standard names is turned on in individual charms * Kinetic-zed bundles/tests are removed Change-Id: If1e623c5c495940c537ebf8b8e666945216f4138 --- tests/bundles/kinetic-zed.yaml | 246 --------------------------------- tests/tests.yaml | 2 - 2 files changed, 248 deletions(-) delete mode 100644 tests/bundles/kinetic-zed.yaml diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index 9c8b631..0000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,246 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: True - -series: kinetic - -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': - # The following units are the nova compute units - '10': - constraints: mem=4G - '11': - constraints: mem=4G - '12': - -applications: - manila-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-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 - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '3' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: latest/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '6' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '7' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '8' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - to: - - '10' - - '11' - channel: latest/edge - - manila: - charm: ch:manila - num_units: 1 - options: - openstack-origin: *openstack-origin - default-share-backend: netapp-ontap - to: - - '12' - channel: latest/edge - - manila-netapp: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap - driver-handles-share-servers: False - - manila-netapp-dhss: - charm: ../../manila-netapp.charm - options: - share-backend-name: netapp-ontap-dhss - driver-handles-share-servers: True - -relations: - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'manila' - - 'rabbitmq-server' - - - 'manila' - - 'keystone' - - - 'manila:manila-plugin' - - 'manila-netapp:manila-plugin' - - - 'manila:manila-plugin' - - 'manila-netapp-dhss:manila-plugin' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-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' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - '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:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement:amqp' - - 'rabbitmq-server:amqp' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/tests.yaml b/tests/tests.yaml index ed16463..4a286d6 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,7 +5,6 @@ gate_bundles: dev_bundles: - jammy-antelope - - kinetic-zed - lunar-antelope # WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See @@ -31,6 +30,5 @@ tests: tests_options: force_deploy: - - kinetic-zed - lunar-antelope