From b92515f4b192c6b9bc0d2866079c759a4aef9ab1 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Wed, 29 Mar 2023 21:01:47 +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: I45bf4ef2d0fc1323132804c7a89cc42a768d18a8 --- tests/bundles/kinetic-zed.yaml | 324 --------------------------------- tests/tests.yaml | 2 - 2 files changed, 326 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 5dccc36..0000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,324 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -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': - # Note that holding memcached at focal as it's not available at kinetic yet. - series: focal - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - constraints: mem=4096M - '14': - constraints: mem=4096M cores=4 - '15': - '16': - '17': - '18': - '19': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - gnocchi-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-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 - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - memcached: - charm: ch:memcached - num_units: 1 - # Note that holding memcached at focal as it's not available at kinetic yet. - series: focal - to: - - '4' - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - options: - source: *openstack-origin - storage: - osd-devices: 'cinder,10G' - to: - - '5' - - '6' - - '7' - channel: latest/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - to: - - '8' - - '9' - - '10' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '13' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: latest/edge - - neutron-api: - charm: ch: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: - - '15' - channel: latest/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '16' - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: latest/edge - - ceilometer: - charm: ch:ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - polling-interval: 10 - polling-batch-size: 0 - to: - - '17' - channel: latest/edge - - gnocchi: - charm: ch:gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '18' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '19' - channel: latest/edge - - ceilometer-agent: - charm: ../../ceilometer-agent.charm - options: - polling-interval: 10 - # NOTE(lourot): we normally set this to `true` in other bundles in order - # to validate more metrics but this is broken on Wallaby. See lp:1938884 - enable-all-pollsters: false - -relations: - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:ceilometer-service' - - 'ceilometer-agent:ceilometer-service' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceilometer-agent:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:nova-ceilometer' - - 'ceilometer-agent:nova-ceilometer' - - - - 'nova-compute:amqp' - - 'rabbitmq-server: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' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - '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' - - - - 'ceph-mon:osd' - - 'ceph-osd:mon' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - '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' diff --git a/tests/tests.yaml b/tests/tests.yaml index 5a44ab7..823f34e 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -13,7 +13,6 @@ gate_bundles: dev_bundles: - jammy-antelope - - kinetic-zed - lunar-antelope smoke_bundles: @@ -30,5 +29,4 @@ target_deploy_status: tests_options: force_deploy: - - kinetic-zed - lunar-antelope